]> source.dussan.org Git - gitblit.git/commitdiff
projects / gitblit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2df02e9 bffa644)
Merge remote-tracking branch 'upstream/master'
authorDavid Ostrovsky <david@ostrovsky.org>
Sun, 14 Apr 2013 09:39:31 +0000 (11:39 +0200)
committerDavid Ostrovsky <david@ostrovsky.org>
Sun, 14 Apr 2013 09:39:31 +0000 (11:39 +0200)
Conflicts:
releases.moxie

1  2 
releases.moxie patch | diff1 | diff2 | blob | history

diff --cc releases.moxie
Simple merge
Pure java git solution: https://github.com/gitblit-org/gitblit