diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:48:42 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:48:42 +0200 |
| commit | 98c9734db4ab8a56faa5297c4994657da2d1599e (patch) | |
| tree | 5e056e8cfc7e6519b2f99dddb264a0717889b6aa /phpBB/phpbb/help/controller | |
| parent | 62abead26d52d02cf7de1e9e639e0c1ace40ba91 (diff) | |
| parent | 6d8df7332cac920b5e8dd7dedf971789d30bc3cb (diff) | |
| download | forums-98c9734db4ab8a56faa5297c4994657da2d1599e.tar forums-98c9734db4ab8a56faa5297c4994657da2d1599e.tar.gz forums-98c9734db4ab8a56faa5297c4994657da2d1599e.tar.bz2 forums-98c9734db4ab8a56faa5297c4994657da2d1599e.tar.xz forums-98c9734db4ab8a56faa5297c4994657da2d1599e.zip | |
Merge branch '3.0.x' into 3.1.x
* 3.0.x:
[3.0.x] Increment version number to 3.0.15-dev.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/phpbb/help/controller')
0 files changed, 0 insertions, 0 deletions