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
..
assets	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
controllers	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
datatables	Merge branch 'master' into rails-5.1	2017-08-07 08:45:53 +02:00
helpers	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
javascript/packs	Revert "Td sci 1492"	2017-08-07 11:47:21 +02:00
mailers	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
models	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
serializers	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
services	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
utilities	Merge pull request #813 from okriuchykhin/ok_SCI_1642	2017-10-12 17:45:34 +02:00
views	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00