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
..
app_config.php	Move the French translations into the development branch.	2013-09-13 21:04:53 +00:00
app_languages.php	fixed some typos	2013-09-17 16:48:23 +00:00
root.php	Move user_settings to the core directory.	2013-01-05 07:02:03 +00:00
user_dashboard.php	Add ring group call forward to the user dashboard.	2013-08-16 06:38:35 +00:00
user_edit.php	Update the references for header.php and footer.php files to point the resources directory.	2013-07-06 06:29:50 +00:00