scinote-web/config/locales
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
..
devise.en.yml Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
devise_invitable.en.yml Initial commit. 2016-02-12 16:52:43 +01:00
en.yml Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00