Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 28 Jul 2016 09:34:59 +0000 (11:34 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 28 Jul 2016 09:34:59 +0000 (11:34 +0200)
commitac2b7b525046a635e67fd31b94d00068acc8b95a
tree282332530c0f6bf877396e3ac7e8a665abd58a4b
parent3782530d4f2211de3aec2f0c2595c15d7b482d6a
parent4ef2bf8840bbe91fd20c1b0d72fdf460a39b0c43
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# wcfsetup/install/files/acp/templates/pageMenuMobile.tpl