Nuno Miguel Reis 1ef7fb3706 fixed some typos ... Conflicts: fusionpbx/app/adminer/app_config.php fusionpbx/app/gateways/app_languages.php fusionpbx/app/ring_groups/app_languages.php fusionpbx/app/voicemails/app_languages.php fusionpbx/core/user_settings/app_languages.php		2013-09-17 16:48:23 +00:00
..
apps	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00
backup	Change the path for includes/require.php to the resources directory.	2013-07-06 06:03:27 +00:00
databases	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00
default_settings	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00
domain_settings	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00
menu	Update the base menu for better defaults.	2013-09-15 05:30:16 +00:00
upgrade	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00
user_settings	fixed some typos	2013-09-17 16:48:23 +00:00
users	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00