From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 22 May 2016 08:21:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: 3.0.0_Beta_1~1681
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9515d423703c91d6862dd1ab4efb561dd67d02a4;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next' into next

# Conflicts:
#	CHANGELOG.md
---

9515d423703c91d6862dd1ab4efb561dd67d02a4
diff --cc CHANGELOG.md
index d0319da22c,017d6d9587..f8a7d7e4c7
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -66,8 -62,7 +66,9 @@@
  * Version system removed.
  * Support for query string based sessions in Frontend removed.
  * Language server system removed.
 +* Object type definition `com.woltlab.wcf.user.online.location` removed.
 +* Object type definition `com.woltlab.wcf.page` removed.
+ * Deprecated methods in `wcf\util\StringUtil` removed.
  
  #### Documentation