diff --git a/r/17.x/admin/index.html b/r/17.x/admin/index.html index f5e716a71..2cb468a88 100644 --- a/r/17.x/admin/index.html +++ b/r/17.x/admin/index.html @@ -764,5 +764,5 @@

Release Documentation

\ No newline at end of file diff --git a/r/17.x/admin/sitemap.xml.gz b/r/17.x/admin/sitemap.xml.gz index 1297a33f1..bb76055cc 100644 Binary files a/r/17.x/admin/sitemap.xml.gz and b/r/17.x/admin/sitemap.xml.gz differ diff --git a/r/17.x/commit b/r/17.x/commit index c45fedd0d..7b495e513 100644 --- a/r/17.x/commit +++ b/r/17.x/commit @@ -1,5 +1,9 @@ -commit 00e7218d5fa398afc3ffdf824d1e65baca836876 -Author: Lars Kiesow -Date: Sat Dec 14 21:29:48 2024 +0100 +commit 630fbc589f956d7a957afb877d6f5d559d45cb0b +Author: Greg Logan +Date: Tue Dec 17 10:12:09 2024 -0600 - Merge r/16.x into r/17.x + Merge branch 'jquery-content-type' of lkiesow/opencast into r/17.x + + Pull request #6390 + + Fix jQuery mime type diff --git a/r/17.x/developer/index.html b/r/17.x/developer/index.html index 2b1ab0eba..d802ff947 100644 --- a/r/17.x/developer/index.html +++ b/r/17.x/developer/index.html @@ -386,5 +386,5 @@

Opencast Development Guides

\ No newline at end of file diff --git a/r/17.x/developer/sitemap.xml.gz b/r/17.x/developer/sitemap.xml.gz index 1297a33f1..bb76055cc 100644 Binary files a/r/17.x/developer/sitemap.xml.gz and b/r/17.x/developer/sitemap.xml.gz differ