diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-19 19:27:15 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-19 19:27:15 +0100 |
| commit | 19f8e255153364c447eb750d4bc9522f7d8e1343 (patch) | |
| tree | 3f4e73915ed65de488a5cc69ded1fc90cbef7d01 | |
| parent | a43c1a46c34230c5a979eb22b5822104f2a0f04c (diff) | |
| parent | e4b44281737728c3af75fc6d1af13721cfe7d8be (diff) | |
| download | forums-19f8e255153364c447eb750d4bc9522f7d8e1343.tar forums-19f8e255153364c447eb750d4bc9522f7d8e1343.tar.gz forums-19f8e255153364c447eb750d4bc9522f7d8e1343.tar.bz2 forums-19f8e255153364c447eb750d4bc9522f7d8e1343.tar.xz forums-19f8e255153364c447eb750d4bc9522f7d8e1343.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13634] Update links to travis build icons
[ticket/13634] Update branch names on README
| -rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -27,9 +27,9 @@ To be able to run an installation from the repo (and not from a pre-built packag We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below: -* develop [](http://travis-ci.org/phpbb/phpbb) -* develop-ascraeus [](http://travis-ci.org/phpbb/phpbb) -* develop-olympus [](http://travis-ci.org/phpbb/phpbb) +* [](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version +* [](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x +* [](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x ## LICENSE |