scinote-web/db
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
..
migrate Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
views adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
load_users_template.yml rename organizations in test/ 2017-01-25 13:56:43 +01:00
schema.rb Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
seeds.rb Allow first user seeding from env variables [SCI-1949] 2018-01-18 16:23:33 +01:00