From cd9c2cf378a9a4037bf791e0a811a38c70b68fe9 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 9 Mar 2015 21:16:31 +0100
Subject: [PATCH] Preparing internal release 2.0.12

---
 com.woltlab.wcf/package.xml                     | 12 ++++++++++--
 wcfsetup/install/files/lib/system/WCF.class.php |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 1ef5873b51..26ae03678c 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>2.0.11 pl 1</version> <!-- codename: maelstrom -->
-		<date>2015-02-26</date>
+		<version>2.0.12</version> <!-- codename: maelstrom -->
+		<date>2015-03-09</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,7 +43,15 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
+	<!-- Heads up! Keep the two update blocks below in sync! -->
+	
 	<instructions type="update" fromversion="2.0.11">
 		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	
+	<instructions type="update" fromversion="2.0.11 pl 1">
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 69cb38facb..39d795eb1d 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.11 pl 1 (Maelstrom)');
+define('WCF_VERSION', '2.0.12 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1