scinote-web/app/views/users/registrations
Luka Murn 9d3685f872 Merge branch 'gamification' into 'master'
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
..
edit.html.erb
new.html.erb