Merge branch '2.1'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 11 Jun 2017 09:11:52 +0000 (11:11 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 11 Jun 2017 09:12:15 +0000 (11:12 +0200)
commit99af9f5fc132b3e9325ddd5393dae074a5c2039f
tree49500d9f0e491a2b0106c84b465c281414344577
parent4ef2e9cda13f5dbac06f91afe41551a340ee3705
parent2dc92c637b10b8ca033759eb7b19d4c4980b19f2
Merge branch '2.1'
wcfsetup/install/files/lib/data/category/CategoryAction.class.php
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php