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
..
calendar.php
customers.php
footer.php	Fix: replace all label class by badge.	2020-06-19 12:48:18 +02:00
header.php	hidden is now d-none	2020-06-18 14:37:11 -04:00
index.html
services.php	bootstrap 4 and font awesome	2020-05-07 10:34:23 -04:00
settings.php
users.php