Alex Tselegidis 069509c8da Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements ... # Conflicts: # application/views/backend/calendar.php # application/views/backend/settings.php		2020-09-23 15:13:58 +03:00
..
db_lang.php	Moved source files to the root directory.	2020-03-11 10:24:25 +01:00
email_lang.php	Moved source files to the root directory.	2020-03-11 10:24:25 +01:00
index.html	Moved source files to the root directory.	2020-03-11 10:24:25 +01:00
migration_lang.php	Moved source files to the root directory.	2020-03-11 10:24:25 +01:00
translations_lang.php	Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements	2020-09-23 15:13:58 +03:00