Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples

Conflicts:
	.gitignore
3-1-stable
Dmitriy Zaporozhets 2012-02-19 11:39:28 +02:00
commit 9edbac5ac8
3 changed files with 2 additions and 0 deletions

2
.gitignore vendored
View File

@ -13,3 +13,5 @@ public/uploads/
nohup.out
Vagrantfile
.vagrant
config/gitlab.yml
config/database.yml