diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-19 19:27:14 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-19 19:27:14 +0100 |
| commit | e4b44281737728c3af75fc6d1af13721cfe7d8be (patch) | |
| tree | 2ad2e9030b2d9507700b24bd371a10c960d2d8a5 | |
| parent | 7fd3767bbdb92cf85cb0a8007eafd1c57b722e2e (diff) | |
| parent | 3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58 (diff) | |
| download | forums-e4b44281737728c3af75fc6d1af13721cfe7d8be.tar forums-e4b44281737728c3af75fc6d1af13721cfe7d8be.tar.gz forums-e4b44281737728c3af75fc6d1af13721cfe7d8be.tar.bz2 forums-e4b44281737728c3af75fc6d1af13721cfe7d8be.tar.xz forums-e4b44281737728c3af75fc6d1af13721cfe7d8be.zip | |
Merge branch '3.0.x' into 3.1.x
* 3.0.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 |