Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sat, 21 May 2016 07:15:56 +0000 (09:15 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 21 May 2016 07:15:56 +0000 (09:15 +0200)
commit35dca983d11314d8e8e96aa06ccc76f379eb7d3b
tree784604752839dfa717efcfda618a2fbe4b333b2b
parent8ff2cd798c6b2fbaf035fb222cd6271f23452389
parent79dc3d5a29206c2fd8b4764474ae2d5ee55b126b
Merge branch 'master' into next
wcfsetup/install.php
wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
wcfsetup/install/files/js/WCF.Location.js
wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql