Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 4 Jun 2015 23:17:34 +0000 (01:17 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 4 Jun 2015 23:17:34 +0000 (01:17 +0200)
commit60f0ca833611579bc6d009d5850df8117fb170ae
treeac683a109a609727420eb0ea7a399bc17afe7a63
parent8e69f2b448fd8d5cd3f7fdedcd36f47cd4fc2e45
parenteffd1f4a650a80e89a3a1f4f23c7cab9581eb2f2
Merge branch 'master' into next
wcfsetup/install/files/js/WCF.js
wcfsetup/install/lang/en.xml