scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-09 05:37:36 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/config/locales
History
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
..
devise.en.yml add comment 2016-11-24 09:48:25 +01:00
devise_invitable.en.yml
doorkeeper.en.yml Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
en.yml Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00