-
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 r/16.x from Mon Jan 13 20:58:13 UTC 2025
- Loading branch information
1 parent
6847376
commit fba0a37
Showing
7 changed files
with
12 additions
and
8 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,9 @@ | ||
commit acfa203a567ba48030e4f4a75b1cd112eb19d8a2 | ||
Author: Lars Kiesow <[email protected]> | ||
Date: Sun Dec 29 16:14:02 2024 +0100 | ||
commit 5242c9ed03ec5d9fd2062d9c7d0f62a18be1c901 | ||
Author: Greg Logan <[email protected]> | ||
Date: Mon Jan 13 14:55:56 2025 -0600 | ||
|
||
Merge r/15.x into r/16.x | ||
Merge branch 'playlist-fix-no-content-id' of KatrinIhler/opencast into r/16.x | ||
|
||
Pull request #6233 | ||
|
||
Handle content id being null for playlist entries |
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.