From 4e0d47351a883a4ec59dae30fc5d669828fd8416 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 21 Jul 2015 15:31:10 +0200
Subject: [PATCH] Preparing internal release 2.1.6

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

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 880764bd03..e85a134817 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.1.5</version> <!-- codename: typhoon -->
-		<date>2015-06-30</date>
+		<version>2.1.6</version> <!-- codename: typhoon -->
+		<date>2015-07-21</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -135,9 +135,11 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.1.4">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+	<instructions type="update" fromversion="2.1.5">
 		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		
 		<instruction type="language" run="standalone">language/*.xml</instruction>
+		<instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 91915f1f3d..daadb77e8c 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.1.5 (Typhoon)');
+define('WCF_VERSION', '2.1.6 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1