Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
Conflicts: .gitignore3-1-stable
commit
9edbac5ac8
|
@ -13,3 +13,5 @@ public/uploads/
|
||||||
nohup.out
|
nohup.out
|
||||||
Vagrantfile
|
Vagrantfile
|
||||||
.vagrant
|
.vagrant
|
||||||
|
config/gitlab.yml
|
||||||
|
config/database.yml
|
||||||
|
|
Loading…
Reference in New Issue