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
..
db_lang.php	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations	2018-07-13 01:13:25 +02:00
email_lang.php	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations	2018-07-13 01:13:25 +02:00
index.html	Autoformatted php files based on CodeIgniter style guide.	2017-09-15 13:36:37 +02:00
migration_lang.php	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations	2018-07-13 01:13:25 +02:00
translations_lang.php	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