aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-25 00:07:18 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-25 00:07:18 +0200
commit3e9d62b9b08691f38f53eb79cdac3698a108a46b (patch)
tree8316d8989f94823114811074a01ccb25c437898a /phpBB/styles
parent70a98e6f633761e695aaa5240d86c038c6f8f233 (diff)
parent19b4391eefb742b3682195231f732240adca48f1 (diff)
downloadforums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar.gz
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar.bz2
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar.xz
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.zip
Merge branch 'prep-release-3.1.0-RC1' into develop-ascraeus
* prep-release-3.1.0-RC1: [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1 [prep-release-3.1.0-RC1] Prepare Changelog [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1 [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1
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 f3dd72cb52..b75207bd70 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = prosilver
copyright = © phpBB Limited, 2007
-style_version = 3.1.0-b4
-phpbb_version = 3.1.0-b4
+style_version = 3.1.0-RC1
+phpbb_version = 3.1.0-RC1
# Defining a different template bitfield
# template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index b9e77bfb4f..9a0c77b627 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Limited
-style_version = 3.1.0-b4
-phpbb_version = 3.1.0-b4
+style_version = 3.1.0-RC1
+phpbb_version = 3.1.0-RC1
# Defining a different template bitfield
# template_bitfield = lNg=