mirror of
https://github.com/alextselegidis/easyappointments.git
synced 2024-11-25 01:12:21 +03:00
6dce7b2f33
# Conflicts: # application/config/autoload.php # application/config/config.php # application/controllers/Appointments.php # application/controllers/Backend.php # application/controllers/Backend_api.php # application/controllers/Captcha.php # application/controllers/Console.php # application/controllers/Google.php # application/controllers/Installation.php # application/controllers/Localization.php # application/core/EA_Controller.php # application/core/EA_Model.php # application/helpers/rate_limit_helper.php # application/language/swedish/translations_lang.php # application/libraries/Google_sync.php # application/libraries/Ics_file.php # application/models/Settings_model.php # application/views/appointments/book_success.php # assets/css/layouts/backend_layout.scss # assets/css/no_privileges.css # assets/js/backend_calendar_table_view.js # assets/js/backend_calendar_unavailability_events_modal.js # assets/js/frontend_book.js # assets/js/frontend_book_success.js # assets/js/general_functions.js # assets/js/working_plan_exceptions_modal.js # composer.lock # gulpfile.js # index.php # package-lock.json # system/libraries/Email.php |
||
|---|---|---|
| .. | ||
| calendar_lang.php | ||
| date_lang.php | ||
| db_lang.php | ||
| email_lang.php | ||
| form_validation_lang.php | ||
| ftp_lang.php | ||
| imglib_lang.php | ||
| migration_lang.php | ||
| number_lang.php | ||
| pagination_lang.php | ||
| profiler_lang.php | ||
| translations_lang.php | ||
| unit_test_lang.php | ||
| upload_lang.php | ||