scinote-web/config/locales
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
..
devise.en.yml add comment 2016-11-24 09:48:25 +01:00
devise_invitable.en.yml
en.yml Merge branch 'master' into rails-5.1 2017-08-07 08:45:53 +02:00