Merge branch 'dev' into feature/rails4

Signed-off-by: Alex Coles <alex@alexbcoles.com>
This commit is contained in:
Alex Coles
2015-06-03 17:42:39 +02:00
47 changed files with 948 additions and 118 deletions
+2 -2
View File
@@ -45,10 +45,10 @@ The [OpenProject Foundation (OPF)](https://community.openproject.org/projects/op
## Repository
This repository contains two main branches:
This repository contains several main branches:
* `dev`: The main development branch. We try to keep it stable in the sense of all tests are passing, but we don't recommend it for production systems.
* `stable`: Contains the latest stable release that we recommend for production use. Use this if you always want the latest version of OpenProject.
* `stable/<version>`: Contains the latest stable release for a specific version. We recommend to use this for production use. Example: `stable/4.1`.
## License