scinote-web/config/locales
Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page
Conflicts:
	Gemfile
	Gemfile.lock
2017-10-23 10:59:10 +02:00
..
devise.en.yml add comment 2016-11-24 09:48:25 +01:00
devise_invitable.en.yml Initial commit. 2016-02-12 16:52:43 +01:00
en.yml Merge branch 'rails-5.1' into decoupling-settings-page 2017-10-23 10:59:10 +02:00