scinote-web/app/services
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
..
api
client_api
import_repository
report_actions
repository_actions
smart_annotations
tasks
api.rb
projects_overview_service.rb
repository_datatable_service.rb
repository_table_state_column_update_service.rb
repository_table_state_service.rb
repository_zip_export.rb
spreadsheet_parser.rb
team_exporter.rb
team_importer.rb
user_data_deletion.rb