Commit 9edbac5a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Conflicts:
	.gitignore
parents a84a9294 e74fae14
...@@ -13,3 +13,5 @@ public/uploads/ ...@@ -13,3 +13,5 @@ public/uploads/
nohup.out nohup.out
Vagrantfile Vagrantfile
.vagrant .vagrant
config/gitlab.yml
config/database.yml
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment