OSDN Git Service

Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 19 Feb 2012 09:39:28 +0000 (11:39 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 19 Feb 2012 09:39:28 +0000 (11:39 +0200)
commit9edbac5ac88ffa1ec9dad0097226b51e29ebc9ac
tree39ea108c8c5da434e2f45bc3eef6e552aa99f314
parenta84a929428169022c6e365c80579ad587ecc55ed
parente74fae147abc7d2ffbf93d363dbbe45b87751f6f
Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples

Conflicts:
.gitignore
.gitignore