Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb		2017-01-18 11:29:40 +01:00
..
confirmations_controller.rb
invitations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb
sessions_controller.rb
settings_controller.rb
unlocks_controller.rb