diff options
author | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:32:36 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:40:23 +0200 |
commit | 969718fc91cc2343332d0b89d9e842a8a1c2c1d3 (patch) | |
tree | 49578dfe84d2326f10476dc330e01dbd03acff65 /phpBB/styles/subsilver2/template/timezone.js | |
parent | eae592691c200490cb8152722dddb7bd12da5207 (diff) | |
parent | d833f290694e7545c0c4168cbf6c565bd52c43ba (diff) | |
download | forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar.gz forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar.bz2 forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.tar.xz forums-969718fc91cc2343332d0b89d9e842a8a1c2c1d3.zip |
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
Diffstat (limited to 'phpBB/styles/subsilver2/template/timezone.js')
0 files changed, 0 insertions, 0 deletions