Alex Tselegidis dd44f8e132 Merge branch 'oxteam-dev-first_week_day' of https://github.com/oxteam/easyappointments into oxteam-oxteam-dev-first_week_day ... # Conflicts: # src/application/language/portuguese-br/translations_lang.php # src/assets/js/backend_calendar_default_view.js # src/assets/js/backend_users_providers.js # src/assets/js/general_functions.js # src/assets/js/working_plan.js		2020-03-10 20:32:53 +01:00
..
application	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
assets	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
engine	Merged pull request #260 - Add 'Location' option to Services [Not a required field]	2019-06-08 17:03:32 +02:00
storage	Updated gitignore	2017-06-11 21:51:36 +02:00
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	Updated copyright year in file headers.	2018-03-27 09:23:09 +02:00
index.php	Updated years in index.php file.	2017-05-18 21:27:37 +02:00