]> source.dussan.org Git - gitblit.git/commitdiff
projects / gitblit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8c1913 08704c6)
Merged #33 "Merge overrides in addition to merging the normal settings"
authorJames Moger <james.moger@gitblit.com>
Mon, 17 Mar 2014 13:36:09 +0000 (07:36 -0600)
committerJames Moger <james.moger@gitblit.com>
Mon, 17 Mar 2014 13:36:09 +0000 (07:36 -0600)

Trivial merge
Pure java git solution: https://github.com/gitblit-org/gitblit