Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 29 Aug 2017 12:12:07 +0000 (14:12 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 29 Aug 2017 12:12:07 +0000 (14:12 +0200)
commit3c881260c780bd2f1828e9be78b85de7a2bab972
tree637fd5225865d24995c9b52e52d32efa4ed1f8e0
parentc8fabd66ff1c7d342b01580de65ff2d04b697e39
parentb8ab2c00a67605d9a53d9808ac3026bd69557e1d
Merge remote-tracking branch 'refs/remotes/origin/3.0'
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
wcfsetup/install/lang/en.xml