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
aws.rb
backtrace_silencers.rb
constants.rb
cookies_serializer.rb
devise.rb
devise_async.rb
extends.rb
filter_parameter_logging.rb
inflections.rb
mime_types.rb
paperclip.rb
session_store.rb
wicked_pdf.rb
wrap_parameters.rb