Merge remote-tracking branch 'refs/remotes/origin/3.0'

diff --cc com.woltlab.wcf/templates/wysiwyg.tpl
index 0922d6221795844b5f150916e238b8a7847f1835,6a78ec338f2d3cc31821e0029ba71d5ef668d442..4db7a0e6a56199607a3d9d4c57162a9b558a24fc
--- 1/com.woltlab.wcf/templates/wysiwyg.tpl
--- 2/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@@ -23,8 -23,8 +23,9 @@@
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabEvent.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabFont.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabFullscreen.js?v={@LAST_UPDATE_TIME}',
 +                      '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabHtml.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabImage.js?v={@LAST_UPDATE_TIME}',
+                       '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabIndent.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabInlineCode.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabInsert.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabKeydown.js?v={@LAST_UPDATE_TIME}',
@@@ -204,8 -202,8 +206,9 @@@
                                        'WoltLabDropdown',
                                        {if $__wcf->getBBCodeHandler()->isAvailableBBCode('font')}'WoltLabFont',{/if}
                                        'WoltLabFullscreen',
 +                                      {if $__wcf->getBBCodeHandler()->isAvailableBBCode('html')}'WoltLabHtml',{/if}
                                        'WoltLabImage',
+                                       'WoltLabIndent',
                                        'WoltLabInlineCode',
                                        'WoltLabInsert',
                                        'WoltLabLine',

diff --cc wcfsetup/install/files/acp/templates/wysiwyg.tpl
index 0922d6221795844b5f150916e238b8a7847f1835,6a78ec338f2d3cc31821e0029ba71d5ef668d442..4db7a0e6a56199607a3d9d4c57162a9b558a24fc
--- 1/wcfsetup/install/files/acp/templates/wysiwyg.tpl
--- 2/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@@ -23,8 -23,8 +23,9 @@@
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabEvent.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabFont.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabFullscreen.js?v={@LAST_UPDATE_TIME}',
 +                      '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabHtml.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabImage.js?v={@LAST_UPDATE_TIME}',
+                       '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabIndent.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabInlineCode.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabInsert.js?v={@LAST_UPDATE_TIME}',
                        '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabKeydown.js?v={@LAST_UPDATE_TIME}',
@@@ -204,8 -202,8 +206,9 @@@
                                        'WoltLabDropdown',
                                        {if $__wcf->getBBCodeHandler()->isAvailableBBCode('font')}'WoltLabFont',{/if}
                                        'WoltLabFullscreen',
 +                                      {if $__wcf->getBBCodeHandler()->isAvailableBBCode('html')}'WoltLabHtml',{/if}
                                        'WoltLabImage',
+                                       'WoltLabIndent',
                                        'WoltLabInlineCode',
                                        'WoltLabInsert',
                                        'WoltLabLine',