Dmitriy Zaporozhets 6024697c10 Merge branch 'master' into 'dz-rename-reserved-project-names' ... # Conflicts: # db/schema.rb		2016-12-27 16:34:20 +00:00
..
fixtures	Merge remote-tracking branch 'origin/master' into improve-pipeline-fixtures	2016-12-18 23:43:13 +01:00
migrate	Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'	2016-12-27 15:00:49 +00:00
post_migrate	Merge branch 'master' into 'dz-rename-reserved-project-names'	2016-12-27 16:34:20 +00:00
schema.rb	Merge branch 'master' into 'dz-rename-reserved-project-names'	2016-12-27 16:34:20 +00:00
seeds.rb