Alex Tselegidis 7d04052697 Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days ... # Conflicts: # src/application/config/migration.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/js/general_functions.js # src/assets/js/working_plan.js # src/assets/sql/data.sql		2020-03-10 20:09:31 +01:00
..
application	Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days	2020-03-10 20:09:31 +01:00
assets	Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days	2020-03-10 20:09:31 +01:00
engine	Merged pull request #260 - Add 'Location' option to Services [Not a required field]	2019-06-08 17:03:32 +02:00
storage
system	Added backtrace in debug log entries.	2019-01-16 10:03:25 +01:00
vendor	Included required composer files.	2019-06-08 16:08:29 +02:00
autoload.php	Added new autoloading directories.	2019-06-08 16:20:14 +02:00
config-sample.php
index.php