diff --git a/r/16.x/admin/index.html b/r/16.x/admin/index.html index 97aad770c..eb66e85ef 100644 --- a/r/16.x/admin/index.html +++ b/r/16.x/admin/index.html @@ -761,5 +761,5 @@

Release Documentation

\ No newline at end of file diff --git a/r/16.x/commit b/r/16.x/commit index fedfca4f6..ecc85813f 100644 --- a/r/16.x/commit +++ b/r/16.x/commit @@ -1,25 +1,5 @@ -commit d44fbd3e44f339dcd8c98cb2b6fada02be417cfa +commit c44433a7322cead43e4aac02bd320735909d00fe Author: Lars Kiesow -Date: Mon Nov 18 00:17:56 2024 +0100 +Date: Mon Nov 18 00:19:48 2024 +0100 - Remove incorrect JDK support statement (#6313) - - This patch removes the section about supported Java versions from the - Debian guide. The information is incorrect and we have a dedicated - section for this by now. - - ### Your pull request should… - - * [x] have a concise title - * [x] [close an accompanying - issue](https://docs.opencast.org/develop/developer/#participate/development-process/#automatically-closing-issues-when-a-pr-is-merged) - if one exists - * [x] [be against the correct - branch](https://docs.opencast.org/develop/developer/development-process#acceptance-criteria-for-patches-in-different-versions) - * [x] include migration scripts and documentation, if appropriate - * [x] pass automated tests - * [x] have a clean commit history - * [x] [have proper commit messages (title and body) for all - commits](https://medium.com/@steveamaza/e028865e5791) - * [x] explain why it needs to be merged into the legacy branch, if it is - targeting the legacy branch + Merge r/15.x into r/16.x diff --git a/r/16.x/developer/index.html b/r/16.x/developer/index.html index 3b7de1f63..1b138a5cb 100644 --- a/r/16.x/developer/index.html +++ b/r/16.x/developer/index.html @@ -424,5 +424,5 @@

Opencast Development Guides

\ No newline at end of file