]> source.dussan.org Git - gitea.git/commit
Merge branch 'master' of github.com:gogits/gogs
authorUnknown <joe2010xtmf@163.com>
Sat, 22 Mar 2014 13:22:55 +0000 (09:22 -0400)
committerUnknown <joe2010xtmf@163.com>
Sat, 22 Mar 2014 13:22:55 +0000 (09:22 -0400)
commitcd070b56d2f5b34236174ff04ccc459d15c4cd17
tree247026fa664dc46ccbb4701cabab3fb749f9ebcd
parentfd1831052c3a79492643b89512282fc66f34dd8d
parent01e781dedb3c6d48349516de0eee5cea41c077e1
Merge branch 'master' of github.com:gogits/gogs

Conflicts:
conf/app.ini
conf/app.ini