Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry ... # Conflicts: # config/initializers/1_settings.rb		2016-05-13 17:14:46 -05:00
..
fixtures	Limit the number of merge requests per project to avoid long seeds	2016-05-04 09:22:01 -07:00
migrate	Merge remote-tracking branch 'origin/master' into docker-registry	2016-05-13 17:14:46 -05:00
schema.rb	Merge remote-tracking branch 'origin/master' into docker-registry	2016-05-13 17:14:46 -05:00
seeds.rb	…