diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-11-27 14:55:05 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-11-27 14:55:24 +0100 |
| commit | 33f4d267ef9a3b65a1fbda82afa13ecc486b5c80 (patch) | |
| tree | 2e19c6d0b72144d50197c01dcc2ad000913553ef /README.md | |
| parent | 0d4bf3ff45a76dcb763c76502944aa7bf78b690b (diff) | |
| parent | 125e76f9aa83141534387a965e8373c9b9cd5c4d (diff) | |
| download | forums-33f4d267ef9a3b65a1fbda82afa13ecc486b5c80.tar forums-33f4d267ef9a3b65a1fbda82afa13ecc486b5c80.tar.gz forums-33f4d267ef9a3b65a1fbda82afa13ecc486b5c80.tar.bz2 forums-33f4d267ef9a3b65a1fbda82afa13ecc486b5c80.tar.xz forums-33f4d267ef9a3b65a1fbda82afa13ecc486b5c80.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842
Conflicts:
phpBB/includes/acp/acp_groups.php
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 - [](http://travis-ci.org/phpbb/phpbb3) -develop-olympus - [](http://travis-ci.org/phpbb/phpbb3) +develop - [](http://travis-ci.org/phpbb/phpbb) +develop-olympus - [](http://travis-ci.org/phpbb/phpbb) ## LICENSE |