aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-03-30 15:40:42 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-03-30 15:40:42 +0200
commit570aab34f5902b2d9875476e6b3237785fa76754 (patch)
tree1d13c06f3783da5c2820097cd63d22aa08a6330f /README.md
parent4346fbee4d740ed37d74c76bb4a1f8f9efd4d9d4 (diff)
parentdc3cb2205bf61428e9f1e6c6318366203e5c316f (diff)
downloadforums-570aab34f5902b2d9875476e6b3237785fa76754.tar
forums-570aab34f5902b2d9875476e6b3237785fa76754.tar.gz
forums-570aab34f5902b2d9875476e6b3237785fa76754.tar.bz2
forums-570aab34f5902b2d9875476e6b3237785fa76754.tar.xz
forums-570aab34f5902b2d9875476e6b3237785fa76754.zip
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus: [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
Diffstat (limited to 'README.md')
-rw-r--r--README.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/README.md b/README.md
index 4b52c1cb33..e6fb17f95f 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,11 @@ To be able to run an installation from the repo (and not from a pre-built packag
## AUTOMATED TESTING
-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-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb)
+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)
## LICENSE