Merge commit 'a39eb241b58c8cd3505a37acc76a327fbdb1c566' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 28 Jul 2016 11:02:01 +0000 (13:02 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 28 Jul 2016 11:02:01 +0000 (13:02 +0200)
commit6b7d6653c5220f4f567f5bab0878f47e0c8a762a
tree9abecc1fe3acb730e4e79c7cc04e7875ca34153e
parentdc9785ef4f5cc12ec6d0b4e0170c8ecdb4fff206
parenta39eb241b58c8cd3505a37acc76a327fbdb1c566
Merge commit 'a39eb241b58c8cd3505a37acc76a327fbdb1c566' into next
27 files changed:
com.woltlab.wcf/templates/__messageFormPoll.tpl
com.woltlab.wcf/templates/quoteBBCodeTag.tpl
com.woltlab.wcf/templates/userInformationButtons.tpl
com.woltlab.wcf/templates/userProfileLikes.tpl
com.woltlab.wcf/templates/usersOnlineList.tpl
wcfsetup/install/files/js/WCF.ImageViewer.js
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/database/editor/DatabaseEditor.class.php
wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php
wcfsetup/install/files/lib/system/database/util/SQLParser.class.php
wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php
wcfsetup/install/files/lib/system/option/user/FacebookUserOptionOutput.class.php
wcfsetup/install/files/lib/system/option/user/GooglePlusUserOptionOutput.class.php
wcfsetup/install/files/lib/system/option/user/TwitterUserOptionOutput.class.php
wcfsetup/install/files/lib/system/option/user/URLUserOptionOutput.class.php
wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
wcfsetup/install/files/lib/system/package/PackageInstallationSQLParser.class.php
wcfsetup/install/files/lib/system/poll/PollManager.class.php
wcfsetup/install/files/lib/system/search/mysql/MysqlSearchEngine.class.php
wcfsetup/install/files/lib/util/PasswordUtil.class.php
wcfsetup/install/files/lib/util/StringUtil.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql