Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock		2017-09-21 08:27:38 +02:00
..
environments	Merge pull request #752 from ZmagoD/testin-rails-5-addons	2017-08-25 08:05:21 +02:00
initializers	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
locales	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
webpack
application.rb	Merge branch 'master' into rails-5.1	2017-08-07 08:45:53 +02:00
boot.rb
cable.yml
cucumber.yml
database.yml
environment.rb
newrelic.yml
puma.rb
routes.rb	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
secrets.yml
spring.rb
webpacker.yml