scinote-web/config/locales
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4'
Conflicts:
	Gemfile.lock
2017-12-19 10:56:39 +01:00
..
devise.en.yml
devise_invitable.en.yml
en.yml Merge branch 'gilson-iot-rails4' 2017-12-19 10:56:39 +01:00