Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 05:45:08 +0000 (06:45 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 05:45:08 +0000 (06:45 +0100)
commit0e6ca348acb8d9fc01bd9d2063ed3385c6320e9b
tree2114ec86d1e364a24e024c1f824967bd1bfda527
parent73551514a41eea9082b1bddaa244f02f9843a8b2
parent53541070c4e8ecf09f90febfced35e21ccd89d35
Merge branch 'master' into next
com.woltlab.wcf/templates/recaptcha.tpl
wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
wcfsetup/install/lang/en.xml