diff options
author | Nils Adermann <naderman@naderman.de> | 2013-10-24 21:53:47 -0500 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2013-10-24 21:53:47 -0500 |
commit | 5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa (patch) | |
tree | 92121a6e4e09c871f3ec82726815e788716a3ed9 /README.md | |
parent | a5eaaa10dcb84ab98312dcebf90930da581d7165 (diff) | |
parent | 98a6f10ce7e69d31ca71528e8cf516bccf0e4cc7 (diff) | |
download | forums-5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa.tar forums-5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa.tar.gz forums-5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa.tar.bz2 forums-5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa.tar.xz forums-5e01ea61f96f3b41a3a6e7c4fb19928f139e42aa.zip |
Merge branch 'task/github-readme/travis' into develop-olympus
* task/github-readme/travis:
[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
@@ -18,8 +18,8 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev ## 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 |