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

Conflicts: .gitignore

Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
9edbac5a · Dmitriy Zaporozhets · a84a9294 · e74fae14 · 9edbac5a · 9edbac5a
Commit 9edbac5a authored 13 years ago by Dmitriy Zaporozhets
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ public/uploads/
 nohup.out
 Vagrantfile
 .vagrant
+config/gitlab.yml
+config/database.yml
--- a/config/database.yml
+++ b/config/database.yml
--- a/config/gitlab.yml
+++ b/config/gitlab.yml