diff options
| author | Unknwon <u@gogs.io> | 2015-07-03 13:41:48 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-07-03 13:41:48 +0800 |
| commit | c76ee1cf83d53d819e61a8d49a731189b32f5488 (patch) | |
| tree | 6195cf2d783f6cbfa3a769be794903628f9c887d /conf/app.ini | |
| parent | c08baee0855807d24a1b86adfcea86d0731e2a3a (diff) | |
| parent | 06476459482cfdcb52cbee65d204d92d0ba3844d (diff) | |
| download | gitea-c76ee1cf83d53d819e61a8d49a731189b32f5488.tar.gz gitea-c76ee1cf83d53d819e61a8d49a731189b32f5488.zip | |
Merge branch 'master' of github.com:gogits/gogs into develop
# Conflicts:
# conf/locale/locale_de-DE.ini
# conf/locale/locale_en-US.ini
# conf/locale/locale_fr-FR.ini
# conf/locale/locale_ja-JP.ini
# conf/locale/locale_pl-PL.ini
# conf/locale/locale_pt-BR.ini
# conf/locale/locale_ru-RU.ini
# conf/locale/locale_zh-CN.ini
# conf/locale/locale_zh-HK.ini
Diffstat (limited to 'conf/app.ini')
0 files changed, 0 insertions, 0 deletions