]> source.dussan.org Git - gitblit.git/commit
projects / gitblit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e2013b9 f1c3a88)
Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap
authormschaefers <mschaefers@scoop-gmbh.de>
Mon, 3 Dec 2012 08:49:23 +0000 (09:49 +0100)
committermschaefers <mschaefers@scoop-gmbh.de>
Mon, 3 Dec 2012 08:49:23 +0000 (09:49 +0100)
commitba6ae959b8e21c714c69f66254e82837d45a3ed2
tree3f538ad138d47b43d8f6a00e0f3c18c147bfcb90tree | snapshot
parente2013b91626a4c693053e9859add68ff371f2298commit | diff
parentf1c3a882d12aede461e3c8ca3ebd298bdb28bc5dcommit | diff
Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap

Conflicts:
distrib/gitblit.properties
distrib/gitblit.properties diff1 | diff2 | blob | history
Pure java git solution: https://github.com/gitblit-org/gitblit