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
..
environments
initializers	Fix the Doorkeeper config/access for all users (due to update of Gem)	2018-10-07 13:11:56 +02:00
locales	Update CREATE, PATCH, DELETE inventory_column endpoints	2018-10-06 17:11:59 +02:00
routes
webpack
application.rb	Add OAuth2 provider [SCI-2515]	2018-08-17 13:17:59 +02:00
boot.rb
cable.yml
cucumber.yml
database.yml
environment.rb
newrelic.yml
puma.rb
routes.rb	Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes	2018-10-15 15:20:26 +02:00
secrets.yml
spring.rb
webpacker.yml
whacamole.rb