-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build of develop from Tue Nov 14 16:22:51 UTC 2023
- Loading branch information
1 parent
61a2ec2
commit e69210e
Showing
7 changed files
with
25 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,21 @@ | ||
commit 3cfbb671008a0558fca4843147df4ef56dfba6c3 | ||
Author: Gregor Eichelberger <[email protected]> | ||
Date: Tue Nov 14 17:02:40 2023 +0100 | ||
commit 44be23c883b602217a11830202449a1629499eaa | ||
Author: Lars Kiesow <[email protected]> | ||
Date: Tue Nov 14 17:22:03 2023 +0100 | ||
|
||
Merge branch 'enable-jwt-by-default' of JulianKniephoff/opencast into develop | ||
Remove duplicate publication channel configuration (#5421) | ||
|
||
Looks like this snuck in by accident a couple of years ago. | ||
|
||
### Your pull request should… | ||
|
||
* [x] have a concise title | ||
* [x] [close an accompanying | ||
issue](https://help.github.com/en/articles/closing-issues-using-keywords) | ||
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.