Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock app/models/connection.rb app/models/experiment.rb app/models/my_module.rb		2017-10-23 08:57:57 +02:00
..
environments
initializers	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
locales	adds label under protocols keywords input [fixes SCI-1560]	2017-10-17 14:10:56 +02:00
webpack
application.rb
boot.rb
cable.yml
cucumber.yml
database.yml
environment.rb
newrelic.yml
puma.rb
routes.rb
secrets.yml
spring.rb
webpacker.yml	Add Webpacker and React [SCI-1461]	2017-07-12 16:41:55 +02:00