Merge branch 'master' of gitea.release11.com:R11/release11-tools into release

Frontend/src/router/index.ts

@@ -12,6 +12,14 @@ const xsdTool = import("@views/XSDView.vue")
 const xpathTool = import("@views/XPathView.vue")
 const xqueryTool = import("@views/XQueryView.vue")
 
+<<<<<<< HEAD
+=======
+const base64Encoder = import("@views/Base64EncoderView.vue")
+const urlEncoder = import("@views/UrlEncoderView.vue")
+
+const restMockMan = import("@views/man/RestMockManView.vue")
+
+>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 const routes = [
   {
     path: '/',
@@ -57,6 +65,24 @@ const routes = [
     path: '/rest/mock',
     name: 'restmock',
     component: () => restMock
+<<<<<<< HEAD
+=======
+  },
+  {
+    path: '/encoder/base64',
+    name: 'base64encoder',
+    component: () => base64Encoder
+  },
+  {
+    path: '/encoder/url',
+    name: 'urlEncoder',
+    component: () => urlEncoder
+  },
+  {
+    path: '/man/rest-mock',
+    name: 'RestMockManView',
+    component: () => restMockMan
+>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
   }
 ]