scinote-web/app
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
..
assets
controllers Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
datatables
helpers
javascript
mailers
middlewares
models Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
permissions
serializers
services Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
utilities
views Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00