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
..
config	Merge branch 'oxteam-dev-first_week_day' of https://github.com/oxteam/easyappointments into oxteam-oxteam-dev-first_week_day	2020-03-10 20:32:53 +01:00
controllers	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
helpers	Updated copyright year in file headers.	2018-03-27 09:23:09 +02:00
language	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
libraries	Merge branch 'citrtech-patch-1' into develop	2020-03-10 20:53:10 +01:00
migrations	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
models	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
views	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
.htaccess	Δημιουργία δομής repository για το Easy!Appointments.	2012-11-11 17:47:25 +00:00
index.html	Δημιουργία δομής repository για το Easy!Appointments.	2012-11-11 17:47:25 +00:00