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
..
adminer.php	Change html_select to adminer_html_select.	2013-07-27 15:52:25 +00:00
app_config.php	fixed some typos	2013-09-17 16:48:23 +00:00
index.php	Change the path for includes/require.php to the resources directory.	2013-07-06 06:03:27 +00:00
root.php	Add a missing file sip_profile_copy.php to the dev branch.	2012-06-04 14:58:40 +00:00