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
..
arabic	Correct translation message key	2022-04-19 09:14:13 +02:00
bulgarian	Correct translation message key	2022-04-19 09:14:13 +02:00
catalan	Update Catalan translation (thanks to Marc Folch)	2022-04-25 14:10:23 +02:00
chinese	Correct translation message key	2022-04-19 09:14:13 +02:00
czech	Correct translation message key	2022-04-19 09:14:13 +02:00
danish
dutch
english
estonian	Update translations_lang.php	2022-04-01 12:02:36 +03:00
finnish
french
german	Correct translation message key	2022-04-19 09:14:13 +02:00
greek	Correct translation message key	2022-04-19 09:14:13 +02:00
hebrew
hindi
hungarian	Correct translation message key	2022-04-19 09:14:13 +02:00
italian	Update italian translation	2022-05-10 14:45:09 +02:00
japanese
luxembourgish
marathi
persian
polish	Correct translation message key	2022-04-19 09:14:13 +02:00
portuguese
portuguese-br
romanian
russian
serbian
slovak	Correct translation message key	2022-04-19 09:14:13 +02:00
spanish	Correct translation message key	2022-04-19 09:14:13 +02:00
swedish	Merge branch 'mickemartinsson-master' into develop	2022-05-10 14:48:46 +02:00
turkish
index.html