Alex Tselegidis 058089134b Merge branch 'make_phone_number_optional' of https://github.com/sandbergja/easyappointments into sandbergja-make_phone_number_optional ... # Conflicts: # src/application/controllers/Appointments.php # src/application/controllers/Backend.php # src/application/language/arabic/translations_lang.php # src/application/language/bulgarian/translations_lang.php # src/application/language/chinese/translations_lang.php # src/application/language/danish/translations_lang.php # src/application/language/dutch/translations_lang.php # src/application/language/english/translations_lang.php # src/application/language/finnish/translations_lang.php # src/application/language/french/translations_lang.php # src/application/language/german/translations_lang.php # src/application/language/greek/translations_lang.php # src/application/language/hindi/translations_lang.php # src/application/language/hungarian/translations_lang.php # src/application/language/italian/translations_lang.php # src/application/language/japanese/translations_lang.php # src/application/language/luxembourgish/translations_lang.php # src/application/language/polish/translations_lang.php # src/application/language/portuguese-br/translations_lang.php # src/application/language/portuguese/translations_lang.php # src/application/language/romanian/translations_lang.php # src/application/language/russian/translations_lang.php # src/application/language/slovak/translations_lang.php # src/application/language/spanish/translations_lang.php # src/application/language/turkish/translations_lang.php # src/assets/sql/data.sql		2020-03-10 21:11:33 +01:00
..
db_lang.php	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations	2018-07-13 01:13:25 +02:00
email_lang.php	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations	2018-07-13 01:13:25 +02:00
index.html	Autoformatted php files based on CodeIgniter style guide.	2017-09-15 13:36:37 +02:00
migration_lang.php	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations	2018-07-13 01:13:25 +02:00
translations_lang.php	Merge branch 'make_phone_number_optional' of https://github.com/sandbergja/easyappointments into sandbergja-make_phone_number_optional	2020-03-10 21:11:33 +01:00