scinote-web/app/services
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
..
api Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
import_repository Fix importing files with empty header cells and error messages improvements [SCI-1484] 2017-07-18 14:54:35 +02:00
api.rb Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00