diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-12-04 20:49:54 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-04 20:49:54 +0100 |
commit | cb0f4790aeddc83cb46d5c5c2f3310d67c579b1b (patch) | |
tree | 7c376676a2a062ec7fdb1dedf497fcd744d70506 | |
parent | 5ef225381d79bdaeeab3973d8d54e334a50df97f (diff) | |
parent | 6be6b69110d6479632d31f7ae0c683333ccf8bd2 (diff) | |
download | forums-cb0f4790aeddc83cb46d5c5c2f3310d67c579b1b.tar forums-cb0f4790aeddc83cb46d5c5c2f3310d67c579b1b.tar.gz forums-cb0f4790aeddc83cb46d5c5c2f3310d67c579b1b.tar.bz2 forums-cb0f4790aeddc83cb46d5c5c2f3310d67c579b1b.tar.xz forums-cb0f4790aeddc83cb46d5c5c2f3310d67c579b1b.zip |
Merge branch '3.2.x' into 3.3.x
-rw-r--r-- | README.md | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -31,9 +31,11 @@ Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use V We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below: -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=master)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/master?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/master) **master** - Latest development version -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.3.x)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.3.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.3.x) **3.3.x** - Development of version 3.3.x -* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.2.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.2.x) **3.2.x** - Development of version 3.2.x +Travis CI | AppVeyor | Branch | Description +---------- | -------- | ------- | ----------- +[![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=master)](http://travis-ci.org/phpbb/phpbb) | [![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/master?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/master) | **master** | Latest development version +[![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.3.x)](http://travis-ci.org/phpbb/phpbb) | [![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.3.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.3.x) | **3.3.x** | Development of version 3.3.x +[![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb) | [![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.2.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.2.x) | **3.2.x** | Development of version 3.2.x ## LICENSE |