Merge remote-tracking branch 'origin/next' into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 22 May 2016 08:21:36 +0000 (10:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 22 May 2016 08:21:36 +0000 (10:21 +0200)
# Conflicts:
# CHANGELOG.md

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
index d0319da22c97d4f31a092b33a42bf1addb195bba,017d6d9587042708c023db1f06fca6a09bce3ffe..f8a7d7e4c780a5d2f5811134df478130023bcb0b
@@@ -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