aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-30 23:01:27 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-03-30 23:01:27 +0200
commita618710a69cf797d2b64a3567b2d2da327cddc25 (patch)
tree566b60106dea46146039a27e908fa7aceed62401 /phpBB/styles
parentacb4d90371cfa2682e74e38c8e3bef087ace7600 (diff)
parent45f2efea19280092da2d58f506c56aee4a998a9d (diff)
downloadforums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.gz
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.bz2
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.xz
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.zip
Merge branch 'prep-release-3.1.0-b2' into develop-ascraeus
* prep-release-3.1.0-b2: [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 [prep-release-3.1.0-b2] Prepare Changelog [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 [prep-release-3.1.0-b2] Update version to 3.1.0-b2
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/style.cfg4
-rw-r--r--phpBB/styles/subsilver2/style.cfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 6b73b25a79..1beb32685c 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -18,8 +18,8 @@
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
-style_version = 3.1.0-b1
-phpbb_version = 3.1.0-b1
+style_version = 3.1.0-b2
+phpbb_version = 3.1.0-b2
# Defining a different template bitfield
# template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 438ced13f4..c534c30bb9 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -18,8 +18,8 @@
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Group
-style_version = 3.1.0-b1
-phpbb_version = 3.1.0-b1
+style_version = 3.1.0-b2
+phpbb_version = 3.1.0-b2
# Defining a different template bitfield
# template_bitfield = lNg=