Release 11.3

2023-05-30 15:42:09 +02:00
parent 72d69f2967 7318708bd2
commit e9221e2393
99 changed files with 12265 additions and 2082 deletions
--- a/Frontend/tools/xsd.html
+++ b/Frontend/tools/xsd.html
@@ -6,6 +6,10 @@
    <link rel="stylesheet" href="../assets/css/tools/r11form.css">
    <link rel="stylesheet" href="../assets/css/highlight.css">
    <script src="../assets/scripts/common/hljs.min.js"></script>
+<<<<<<< HEAD
+=======
+    <script src="../assets/scripts/tools/xsd.js"></script>
+>>>>>>> master
    <script src="../assets/scripts/tools/scripts.js"></script>
    <script src="../assets/scripts/tools/highlight.js"></script>
    <script>hljs.highlightAll();</script>
@@ -79,6 +83,7 @@

    </div>

+<<<<<<< HEAD
    <script>
        function init() {
            // Make sure that only plain text is pasted
@@ -118,6 +123,8 @@

    </script>

+=======
+>>>>>>> master
 </body>

 </html>