summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-02 15:41:05 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-02 15:41:05 +0200
commitcc2d7771db4aea62e7597b433900d052b7ed944d (patch)
treebd074087b641887758a7fac706c0c3fc76c104e7 /doc/development
parent798977c87b61f2f7ae000cee3d1c5fc232ec0754 (diff)
parent093c2c6a01fe2cfaff72b2624b65896fed339ab5 (diff)
downloadgitlab-ce-cc2d7771db4aea62e7597b433900d052b7ed944d.tar.gz
Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into Razer6-feature/zen_for_gfm
Conflicts: CHANGELOG
Diffstat (limited to 'doc/development')
0 files changed, 0 insertions, 0 deletions