]> source.dussan.org Git - gitea.git/commit
Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop
authorUnknwon <u@gogs.io>
Sun, 16 Aug 2015 06:31:54 +0000 (14:31 +0800)
committerUnknwon <u@gogs.io>
Sun, 16 Aug 2015 06:31:54 +0000 (14:31 +0800)
commit55ccb00a47e580efc1cf184e31dd19f05137a4b3
treead538b0525a886c8f1c0549709e8b97ac8e811d0
parent6d3e5a36a1d81cc690807768de3f686699f4c171
parentf8a4ab25fda9731803e787160f54d767d1b57eef
Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop

# Conflicts:
# modules/bindata/bindata.go
conf/locale/locale_de-DE.ini
conf/locale/locale_en-US.ini
conf/locale/locale_es-ES.ini
conf/locale/locale_ja-JP.ini
conf/locale/locale_pt-BR.ini
conf/locale/locale_zh-CN.ini
modules/auth/ldap/ldap.go
modules/bindata/bindata.go