Luka Murn 070450f813 Merge branch 'release-1.12.11' ... Conflicts: config/initializers/extends.rb		2018-03-01 14:04:57 +01:00
..
assets	Merge pull request #995 from ZmagoD/zd_SCI_2040	2018-02-15 13:05:30 +01:00
controllers	fix bug with load older activities button not working	2018-02-16 15:42:10 +01:00
datatables
helpers	Merge branch 'release-1.12.11'	2018-03-01 14:04:57 +01:00
javascript	Comment react-hijack code	2018-02-06 08:00:29 +01:00
mailers
models	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
permissions	Minor experiment level permissions refactoring.	2018-02-14 14:19:22 +01:00
serializers
services
utilities
views	Merge branch 'release-1.12.11'	2018-03-01 14:04:57 +01:00