Jake Barnby b343158d19 Merge remote-tracking branch 'origin/main' into 1.6.x ... # Conflicts: # .gitmodules # app/console # composer.lock # tests/e2e/Services/Health/HealthCustomServerTest.php		2024-07-10 19:11:04 +12:00
..
templates	Merge remote-tracking branch 'origin/main' into 1.6.x	2024-07-10 19:11:04 +12:00
translations	Merge remote-tracking branch 'origin/main' into 1.6.x	2024-07-10 19:11:04 +12:00
codes.php	fix duplicate locale code and tests passes	2023-08-11 21:29:13 +05:30
continents.php	feat(locale): use new locale functions	2021-07-23 01:45:01 +05:30
countries.php	Add PS to list of countries in countries.php	2024-04-27 00:36:33 +03:00
currencies.php	Update currencies.php	2021-10-09 17:44:30 +02:00
eu.php	Update eu.php	2020-10-25 08:01:41 -07:00
languages.php	Update Chinese language native names in languages.php	2024-05-17 17:39:35 +03:00
phones.php	Add PS to list of countries in phones.php	2024-04-27 01:17:22 +03:00
templates.php	fix: missing team variable and added mfa templates to config	2024-02-23 14:59:12 +01:00
terms.json	revert(terms): readd english version	2021-10-05 10:52:21 +02:00