From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 13 Feb 2020 10:33:11 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.3~31
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1bea22d8f01715c9de51a3d75a804ed2d441208a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

1bea22d8f01715c9de51a3d75a804ed2d441208a
diff --cc wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
index a3a9fd842a,737bd1fdfd..d0f82d2539
--- a/wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
@@@ -2653,7 -3024,7 +2653,7 @@@
  							}
  						}
  					});
--
++					
  					// lists
  					var lastList = false;
  					var lastLevel = 1;