Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 2 Oct 2016 09:54:42 +0000 (11:54 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 2 Oct 2016 09:54:42 +0000 (11:54 +0200)
commitf0bd863f261fe57dc4164f92aef53ec118b93ecc
treead3b3111212cb888255660b86862a91d88939733
parentfc52a8455af83ba1bd477080a6524ff58a107db7
parent75cbe31a37ddc310267129f303a4e831dbd6e6e3
Merge branch 'master' into next

# Conflicts:
# wcfsetup/install/files/js/WCF.Combined.min.js
wcfsetup/install/files/lib/data/comment/StructuredComment.class.php