Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 5 Apr 2017 13:22:47 +0000 (15:22 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 5 Apr 2017 13:22:47 +0000 (15:22 +0200)
commitf5b082c0eb76c6aaa4a319707b72ba8c7cebdd03
tree95cb8b4d771909309b62e415b995f2f20406f2e2
parentdf25a6b1357d3a687fd8bdaf73871a51c78079a1
parentc00717d040c931a1d487c6be3a0c72c829dfd017
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/rescueMode.tpl
wcfsetup/install/files/js/WCF.Message.js