blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts after merging master

Browse Source
This commit is contained in:
Harald Bamberger
2022-03-28 11:59:26 +02:00
parent f1bf3bb4be 86e15f2435
commit fce72b1f91
153 changed files with 60453 additions and 48698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -248,7 +248,7 @@
"chillerlan/php-qrcode": "2.0.*",
"chriskacerguis/codeigniter-restserver": "3.0.*",
"chriskacerguis/codeigniter-restserver": "3.0.3",
"christianbach/tablesorter": "1.0.*",
"codeigniter/framework": "3.*",
"components/jquery": "3.*",