]> source.dussan.org Git - gitea.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Boke <michael@mbict.nl>
Fri, 3 Oct 2014 20:51:07 +0000 (22:51 +0200)
committerMichael Boke <michael@mbict.nl>
Fri, 3 Oct 2014 20:51:07 +0000 (22:51 +0200)
commitba1270df2d3d835b397317f133963e7b517242f1
tree1265a142a1fd9951d30ae11648e7fbfb5806e594
parentba0feadc34400cb91ff23f66096884d862651cdd
parent405ee14711ab946bd709ec28a526890c40cbc03b
Merge remote-tracking branch 'upstream/master'

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