diff options
author | Andreas Fischer <bantu@phpbb.com> | 2014-03-30 15:40:42 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-30 15:40:42 +0200 |
commit | 570aab34f5902b2d9875476e6b3237785fa76754 (patch) | |
tree | 1d13c06f3783da5c2820097cd63d22aa08a6330f /README.md | |
parent | Merge pull request #2198 from n-aleha/ticket/12321 (diff) | |
parent | Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympus (diff) | |
download | phpbb-570aab34f5902b2d9875476e6b3237785fa76754.tar.gz phpbb-570aab34f5902b2d9875476e6b3237785fa76754.tar.bz2 phpbb-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.md | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 |