deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
Dmitriy Zaporozhets 2012-02-19 11:39:28 +02:00
commit 9edbac5ac8
3 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

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

0
config/database.yml → config/database.yml.example
View file

0
config/gitlab.yml → config/gitlab.yml.example
View file