Alex Tselegidis 923d7bd4c4 Merge branch 'ftaurino-patch-1' into develop ... # Conflicts: # src/application/language/italian/translations_lang.php		2020-03-10 20:57:00 +01:00
..
application	Merge branch 'ftaurino-patch-1' into develop	2020-03-10 20:57:00 +01:00
assets	Merge branch 'enddatetime-according-to-start-and-service' of https://github.com/Caine85/easyappointments into Caine85-enddatetime-according-to-start-and-service	2020-03-10 20:44:51 +01:00
engine	Merge branch 'oxteam-oxteam-translation-cleanup-2' into develop	2020-03-10 20:35:31 +01: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