-
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/17.x from Tue Dec 17 16:24:51 UTC 2024
- Loading branch information
1 parent
a416ed2
commit 22a2dda
Showing
5 changed files
with
10 additions
and
6 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
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,9 @@ | ||
commit 00e7218d5fa398afc3ffdf824d1e65baca836876 | ||
Author: Lars Kiesow <[email protected]> | ||
Date: Sat Dec 14 21:29:48 2024 +0100 | ||
commit 630fbc589f956d7a957afb877d6f5d559d45cb0b | ||
Author: Greg Logan <[email protected]> | ||
Date: Tue Dec 17 10:12:09 2024 -0600 | ||
|
||
Merge r/16.x into r/17.x | ||
Merge branch 'jquery-content-type' of lkiesow/opencast into r/17.x | ||
|
||
Pull request #6390 | ||
|
||
Fix jQuery mime type |
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.