Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 18 Sep 2016 08:09:07 +0000 (10:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 18 Sep 2016 08:09:07 +0000 (10:09 +0200)
commit0adfffbac3383ea23bef95f845becddee4941e05
treea9672816c7b2c0b32b2f6a05ee30059919f0db29
parentfb0641f2d81b1357280709436d11fa7b07fd5142
parent75f097f2166d578e233a6741f4691301feb05418
Merge branch 'master' into next
com.woltlab.wcf/templates/textSearchableOptionType.tpl
wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php