Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 2 Aug 2018 14:23:38 +0000 (16:23 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 2 Aug 2018 14:23:38 +0000 (16:23 +0200)
commit580fe19940f7c7942605afc9b1c32ab805dc87f6
tree85f9cabe51e8eee109b113fa767f21c39e4feca9
parentb9f4018c6dd847925d66703132cbaac807d0a3de
parenta25324711552971f5a78b50b6034280dc7edfb03
Merge branch 'master' into next
wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
wcfsetup/install/lang/de.xml