-
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:19:28 UTC 2023
- Loading branch information
1 parent
9268bc7
commit 61a2ec2
Showing
7 changed files
with
7 additions
and
25 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
commit f20e40a098b826363f0bef33eb7e2a665a947386 | ||
Author: Lars Kiesow <[email protected]> | ||
Date: Tue Nov 14 15:02:05 2023 +0100 | ||
commit 3cfbb671008a0558fca4843147df4ef56dfba6c3 | ||
Author: Gregor Eichelberger <[email protected]> | ||
Date: Tue Nov 14 17:02:40 2023 +0100 | ||
|
||
Merge r/14.x into develop | ||
Merge branch 'enable-jwt-by-default' of JulianKniephoff/opencast into develop |
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.