scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/controllers/api
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
..
v1 Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
api_controller.rb Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00