Alex Tselegidis 4cc4437dad Merge branch 'bootstrap-4-and-fontawesome' of https://github.com/janinavelasco9/easyappointments into janinavelasco9-bootstrap-4-and-fontawesome ... # Conflicts: # application/views/backend/calendar.php # assets/js/backend_calendar_extra_periods_modal.js # assets/js/backend_customers_helper.js		2020-08-15 18:41:14 +03:00
..
book.php	Merge branch 'bootstrap-4-and-fontawesome' of https://github.com/janinavelasco9/easyappointments into janinavelasco9-bootstrap-4-and-fontawesome	2020-08-15 18:41:14 +03:00
book_success.php	Merge branch 'develop' into bootstrap-4-and-fontawesome	2020-06-09 10:36:54 -04:00
cookie_notice_modal.php	Fix some modal title and "close" button display	2020-06-29 15:31:59 +02:00
index.html	Added missing index.html files in the application/views directory.	2020-05-12 21:01:06 +02:00
message.php	Merge branch 'develop' into bootstrap-4-and-fontawesome	2020-06-09 10:36:54 -04:00
privacy_policy_modal.php	Fix some modal title and "close" button display	2020-06-29 15:31:59 +02:00
terms_and_conditions_modal.php	Fix some modal title and "close" button display	2020-06-29 15:31:59 +02:00