Preparing internal release 3.1.0 RC 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index d426d8df96cec594f77a57cc4ff0a206b5a23eac..e5e95beebd2770fb35696aff7c6add313cff9c66 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>3.1.0 RC 1</version> <!-- codename: tornado -->
-               <date>2018-01-15</date>
+               <version>3.1.0 RC 2</version> <!-- codename: tornado -->
+               <date>2018-01-24</date>
        </packageinformation>
        
        <authorinformation>
@@ -95,13 +95,13 @@
                <instruction type="style">defaultStyle.tar</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="3.1.0 Beta 5">
+       <instructions type="update" fromversion="3.1.0 RC 1">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
                <instruction type="language" />
                
-               <instruction type="objectType" />
+               <instruction type="userNotificationEvent" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 37a6e5019de473997497cd7cc41621bbb29d5325..04471d382bf0e326e7c5e36c1ae9617b0eb3a63a 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -48,7 +48,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0 RC 1');
+define('WCF_VERSION', '3.1.0 RC 2');
 
 // define current API version
 define('WSC_API_VERSION', 2018);
@@ -67,7 +67,7 @@ if (!defined('NO_IMPORTS')) {
  * It holds the database connection, access to template and language engine.
  * 
  * @author     Marcel Werk
- * @copyright  2001-2017 WoltLab GmbH
+ * @copyright  2001-2018 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    WoltLabSuite\Core\System
  */