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 | |
| 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
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -13,7 +13,7 @@ Gogs (Go Git Service) is a painless self-hosted Git service. - Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) has been reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site. - The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch. -- You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Reuqests, otherwise it's high possibilities that we are not going to merge it. +- You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Requests, otherwise it's high possibilities that we are not going to merge it. - If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks! #### Other language version |