Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page ... Conflicts: Gemfile Gemfile.lock		2017-10-23 10:59:10 +02:00
..
client_api/users
activity_helper.rb
addons_helper.rb
application_helper.rb
bootstrap_form_helper.rb
database_helper.rb
file_icons_helper.rb
form_tag_helper.rb
input_sanitize_helper.rb
mailer_helper.rb
my_modules_helper.rb
notifications_helper.rb
permission_helper.rb
projects_helper.rb
protocol_status_helper.rb
reports_helper.rb
results_helper.rb
samples_helper.rb
search_helper.rb
secondary_navigation_helper.rb
sidebar_helper.rb
teams_helper.rb
tiny_mce_helper.rb
user_settings_helper.rb
wopi_helper.rb