mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-10-16 16:59:33 +00:00
# Conflicts: # public/css/Cis4/CoreCalendarEvents.css # public/js/components/Calendar/Base.js # public/js/components/Calendar/Base/Grid.js # public/js/components/Calendar/Base/Header.js # public/js/components/Calendar/Base/Header/Datepicker.js # public/js/components/Calendar/Mode/Week.js # system/phrasesupdate.php # system/seeders/015_kalender.sql # tests/cypress/.env.example