Build of r/14.x from Thu Nov 9 18:02:29 UTC 2023

opencast · Nov 9, 2023 · 000f302 · 000f302
1 parent e61c517
commit 000f302
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/r/14.x/admin/index.html b/r/14.x/admin/index.html
@@ -807,5 +807,5 @@ <h2 id="release-documentation">Release Documentation</h2>
 </html>
 <!--
 MkDocs version : 1.5.3
-Build Date UTC : 2023-11-08 21:14:12.709531+00:00
+Build Date UTC : 2023-11-09 18:02:11.170865+00:00
 -->
diff --git a/r/14.x/admin/sitemap.xml.gz b/r/14.x/admin/sitemap.xml.gz
diff --git a/r/14.x/commit b/r/14.x/commit
@@ -1,9 +1,5 @@
-commit 3d55ed467724f628279817d67b3b53fe603157a8
-Author: Greg Logan <[email protected]>
-Date:   Wed Nov 8 14:08:09 2023 -0600
+commit 00aea5f06f0876178882cf6ddb5bba21e45e4d7e
+Author: Lars Kiesow <[email protected]>
+Date:   Thu Nov 9 19:01:24 2023 +0100
 
-    Merge branch 'OPENCAST-3165_UCT_stream_media_packages' of cilt-uct/opencast into r/14.x
-
-    Pull request #5365
-
-      Stream media packages to avoid memory issues
+    Merge r/13.x into r/14.x
diff --git a/r/14.x/developer/index.html b/r/14.x/developer/index.html
@@ -403,5 +403,5 @@ <h1 id="opencast-development-guides">Opencast Development Guides</h1>
 </html>
 <!--
 MkDocs version : 1.5.3
-Build Date UTC : 2023-11-08 21:14:14.139859+00:00
+Build Date UTC : 2023-11-09 18:02:13.466348+00:00
 -->
diff --git a/r/14.x/developer/sitemap.xml.gz b/r/14.x/developer/sitemap.xml.gz