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
..
experiments
my_modules
projects
protocols
reports
repositories
results
samples
sitewide
users
application.js.erb
assets.js
comments.js.erb
my_modules.js
navigation.js
notifications.js
search.js
sidebar.js.erb