scinote-web/app/views/users
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 Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00
invitations fixes bug with deleted team name [fixes SCI-746] 2016-12-02 16:07:00 +01:00
mailer Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
passwords Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00
registrations setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
sessions Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00
settings Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
shared Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00
unlocks Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00