mirror
/
fenom
mirror of https://github.com/fenom-template/fenom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #114 from MunGell/master 

English docs
This commit is contained in:
Ivan Shalganov 2014-09-15 21:26:17 +04:00
parent 88a5efb7ea 292bdd90b5
commit e01a474b90
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/en/dev/git.md
View File

@ -1,5 +0,0 @@
Git conversation
================
Ветка `master` содержит стабильную последнюю версию проекта. В ветку `master` может сливаться новая версия проекта из `develop` или исправления.
Ветка `develop`, для разработки, содержит не стабильную версию проекта. Принимает все новшевства, изменения и исправления.

13
docs/en/dev/readme.md
View File

@ -1,12 +1,15 @@
Develop
=======
If you want to discuss the enhancement of the Fenom, create an issue on Github or submit a pull request.
If you want to contribute to Fenom please feel free to create an issue or submit a pull request on Github.
There tho branches — master and develop.
The branch master for stable releases and hotfixes; the branch develop for development of features. Each tag names by rule `major.minor.fix` (1.4.9, 1.1.2 etc) and creates from master. Version changes by the rule of [semantic versioning](http://semver.org/).
There are two branches:
* `master` branch is for stable releases and hotfixes
* `develop` branch is for development of features
Each tag names by rule `major.minor.fix` (1.4.9, 1.1.2, etc.) and creates from master. Version changes by the rule of [semantic versioning](http://semver.org/).
For questions: a.cobest@gmail.com (English, Russian languages)
* the [scheme of work](schema.md)
* the [scheme of work](schema.md)