Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss		2016-11-17 16:39:33 +01:00
..
assets.rb	Add first version of invite users modal	2016-11-07 09:43:09 +01:00
aws.rb
backtrace_silencers.rb
constants.rb	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
cookies_serializer.rb
devise.rb	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
devise_async.rb
extends.rb	added extends file	2016-11-08 11:26:55 +01:00
filter_parameter_logging.rb
inflections.rb
mime_types.rb
paperclip.rb	If file is recognized as office file, it's allowed to be any office file type.	2016-09-07 14:04:11 +02:00
session_store.rb
wicked_pdf.rb	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
wrap_parameters.rb