Sean McGivern 36838a843e Merge branch 'master' into '3867-port-to-ce' ... # Conflicts: # db/schema.rb		2018-02-02 11:58:32 +00:00
..
fixtures	Merge branch 'sh-reuse-disk-repositories-seeder' into 'master'	2018-01-05 21:25:24 +00:00
migrate	Merge branch 'master' into '3867-port-to-ce'	2018-02-02 11:58:32 +00:00
post_migrate	Applied fix	2018-01-17 21:42:18 +01:00
schema.rb	Merge branch 'master' into '3867-port-to-ce'	2018-02-02 11:58:32 +00:00
seeds.rb	…