Alex Tselegidis 6dce7b2f33 Merge branch 'mickemartinsson-master' into develop ... # 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		2022-05-10 14:48:46 +02:00
..
calendar_lang.php	Swedish translation	2022-02-05 08:53:11 +01:00
date_lang.php
db_lang.php
email_lang.php
form_validation_lang.php
ftp_lang.php
imglib_lang.php	Swedish translation	2022-02-05 08:53:11 +01:00
migration_lang.php
number_lang.php
pagination_lang.php
profiler_lang.php
translations_lang.php	Merge branch 'mickemartinsson-master' into develop	2022-05-10 14:48:46 +02:00
unit_test_lang.php
upload_lang.php