mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
Merge branch 'master' into feature-25999/C4_cleanup
# Conflicts: # public/js/apps/Dashboard/Fhc.js # public/js/components/Cis/Cms/Content.js # public/js/components/Cis/Cms/News.js # public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js # public/js/components/Cis/Mylv/LvUebersicht.js # public/js/components/Cis/Stundenplan/Stundenplan.js # public/js/components/DashboardWidget/Ampel.js # public/js/components/DashboardWidget/News.js # public/js/components/DashboardWidget/Stundenplan.js # public/js/components/DashboardWidget/Url.js # system/phrasesupdate.php
This commit is contained in:
+14
-2
@@ -237,6 +237,17 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "package",
|
||||
"package": {
|
||||
"name": "olifolkerd/tabulator6",
|
||||
"version": "6.3.1",
|
||||
"dist": {
|
||||
"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/6.3.1.zip",
|
||||
"type": "zip"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "package",
|
||||
"package": {
|
||||
@@ -287,9 +298,9 @@
|
||||
"name": "tomazdragar/simplecropper",
|
||||
"version": "1.0",
|
||||
"source": {
|
||||
"url": "https://github.com/tomazdragar/SimpleCropper.git",
|
||||
"url": "https://github.com/deveshsinghal22/SimpleCropper.git",
|
||||
"type": "git",
|
||||
"reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde"
|
||||
"reference": "873e5e1ca57c370bedd07a512d0bf562930d4b89"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -462,6 +473,7 @@
|
||||
|
||||
"olifolkerd/tabulator4": "4.9.*",
|
||||
"olifolkerd/tabulator5": "5.5.*",
|
||||
"olifolkerd/tabulator6": "6.3.*",
|
||||
|
||||
"phpseclib/phpseclib": "2.0.*",
|
||||
|
||||
|
||||
Reference in New Issue
Block a user