1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 20:32:11 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-09-13 20:35:34 +02:00
commit 46bd456825
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -14,18 +14,6 @@
require __DIR__ . '/doctum-checkout.conf.php';
$config['versions'] = Doctum\Version\GitVersionCollection::create(__DIR__ . '/../')
/*
This would be nice, but currently causes various problems that need
debugging.
->addFromTags('release-3.0.*')
->add('3.0.x', '3.0-next (olympus)')
->addFromTags('release-3.1.*')
->add('3.1.x', '3.1-next (ascraeus)')
->add('master')
*/
->add('3.0.x')
->add('3.1.x')
->add('3.2.x')
->add('3.3.x')
->add('master')
;