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

parent a84a929428 e74fae147a

commit 9edbac5ac8

3 changed files with 2 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

config/database.yml → config/database.yml.example

Unescape Escape View file

0

config/gitlab.yml → config/gitlab.yml.example

Unescape Escape View file