aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-02-19 19:27:14 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-02-19 19:27:14 +0100
commit3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58 (patch)
tree46215bb4330383b191dd960c76c123ef1db87e40 /README.md
parent877774a296c2a61856c6f7012b588965d56073a9 (diff)
parentbbf4bcc9861b62b7493b2c6b4020333304ad5932 (diff)
downloadforums-3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58.tar
forums-3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58.tar.gz
forums-3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58.tar.bz2
forums-3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58.tar.xz
forums-3db7ac0aadccc2e3d47f6cffaa0cc7925b167c58.zip
Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.x
[ticket/13634] Update branch names on README * VSEphpbb/ticket/13634-3.0.x: [ticket/13634] Update links to travis build icons [ticket/13634] Update branch names on README
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 37a42fa57f..0c2af7a009 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev
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 [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop)](http://travis-ci.org/phpbb/phpbb)
-* develop-ascraeus [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop-ascraeus)](http://travis-ci.org/phpbb/phpbb)
-* develop-olympus [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb)
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=master)](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.0.x)](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x
## LICENSE