-
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/15.x from Tue Jan 16 14:30:36 UTC 2024
- Loading branch information
1 parent
b2842b1
commit 00b2857
Showing
8 changed files
with
22 additions
and
11 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
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,9 +1,8 @@ | ||
commit 135b1b40793b998d336099d608a0841eca38d839 | ||
Author: Greg Logan <[email protected]> | ||
Date: Tue Jan 9 11:26:20 2024 -0600 | ||
commit 8abbf20d9ca5999ec332f7c3ddac2bfaffb7c591 | ||
Author: Waldemar Smirnow <[email protected]> | ||
Date: Tue Jan 16 15:27:44 2024 +0100 | ||
|
||
Merge branch 'update-dependencies' of geichelberger/opencast into r/15.x | ||
Merge branch 'r/14.x' into r/15.x | ||
|
||
Pull request #5468 | ||
|
||
Update dependencies | ||
# Conflicts: | ||
# docs/guides/admin/docs/releasenotes.md |
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.