Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gogits/gogs into develop

Browse Source 
# 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
This commit is contained in:
Unknwon 2015-07-03 13:41:48 +08:00
commit c76ee1cf83
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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