Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb		2014-03-14 12:00:21 +02:00
..
fixtures	Add testme repo for dev seeds	2014-02-28 10:06:17 +02:00
migrate	Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout	2014-03-14 12:00:21 +02:00
schema.rb	Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout	2014-03-14 12:00:21 +02:00
seeds.rb	init commit	2011-10-09 00:36:38 +03:00