diff options
author | Nils Adermann <naderman@naderman.de> | 2013-10-24 21:54:46 -0500 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2013-10-24 21:54:46 -0500 |
commit | fe7745a1e8f8b623e088d07b821fe83c745f4371 (patch) | |
tree | 2c0962ad1fe794aac59dd0bb44e4fa20dc373f4d /README.md | |
parent | f67ebc2cdb5fc5e9475df7aa6b809bc8728734ba (diff) | |
parent | 5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa (diff) | |
download | forums-fe7745a1e8f8b623e088d07b821fe83c745f4371.tar forums-fe7745a1e8f8b623e088d07b821fe83c745f4371.tar.gz forums-fe7745a1e8f8b623e088d07b821fe83c745f4371.tar.bz2 forums-fe7745a1e8f8b623e088d07b821fe83c745f4371.tar.xz forums-fe7745a1e8f8b623e088d07b821fe83c745f4371.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[task/github-readme/travis] Fix Travis-Badge and link
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -26,8 +26,8 @@ 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/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3) -develop-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3) +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) ## LICENSE |