]> source.dussan.org Git - gitea.git/commit
Merge branch 'master' of try.gogits.org:lunny/gogs
authorLunny Xiao <xiaolunwen@gmail.com>
Tue, 25 Mar 2014 09:14:28 +0000 (17:14 +0800)
committerLunny Xiao <xiaolunwen@gmail.com>
Tue, 25 Mar 2014 09:14:28 +0000 (17:14 +0800)
commit5bfad6867d1bfd94880a42356651a680920f598a
treee6b88aa1089b35c8d002149551a93f665764db4b
parentd24a4a142e5de9b2d9701ae93892234122e8b89b
parent1d30f545d65fe2d7fe6e0a88fbb693ca68e9417e
Merge branch 'master' of try.gogits.org:lunny/gogs

Conflicts:
.gitignore
LICENSE
.gitignore
LICENSE