Luka Murn 1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes ... Conflicts: app/serializers/api/v1/activity_serializer.rb app/serializers/api/v1/inventory_column_serializer.rb app/serializers/api/v1/project_serializer.rb		2018-10-15 15:20:26 +02:00
..
base_controller.rb
connections_controller.rb
experiments_controller.rb
inventories_controller.rb
inventory_columns_controller.rb
inventory_items_controller.rb
inventory_list_items_controller.rb
project_comments_controller.rb
projects_controller.rb
protocols_controller.rb
reports_controller.rb
results_controller.rb
task_groups_controller.rb
task_inventory_items_controller.rb
task_tags_controller.rb
task_users_controller.rb
tasks_controller.rb
teams_controller.rb
user_identities_controller.rb
user_projects_controller.rb
users_controller.rb