]> source.dussan.org Git - gitea.git/commit
Merge branch 'dev' of github.com:gogits/gogs into dev
authorlunnyxiao <xiaolunwen@gmail.com>
Wed, 17 Sep 2014 04:04:18 +0000 (12:04 +0800)
committerlunnyxiao <xiaolunwen@gmail.com>
Wed, 17 Sep 2014 04:04:18 +0000 (12:04 +0800)
commit061a879cea39a1cce56dcb394b912fad50d7b77a
tree26e8c3d25da1b9d785421a6a02b7564798b2e8c4
parented84adb679f3de70b2bffaead20a87711c38ee3a
parent9f015b4c73806e65d3ca085b76723dc8cf41eb02
Merge branch 'dev' of github.com:gogits/gogs into dev

Conflicts:
conf/app.ini
conf/app.ini
modules/setting/setting.go