Matthew Vale 81b85c3caf Merge branch 'fusionpbx/master' into Enhance-Languages ...

Conflicts:
	app/extensions/app_languages.php

2015-12-11 08:45:26 +00:00

..

resources/classes

Update extension.php

2015-12-09 14:04:26 -08:00

app_config.php

Update app_config.php

2015-12-09 13:59:43 -08:00

app_defaults.php

…

app_languages.php

extension download

2015-12-10 15:07:46 -08:00

app_menu.php

Add latest translations

2015-08-02 23:42:11 +00:00

extension_copy.php

…

extension_delete.php

…

extension_download.php

extension download

2015-12-10 15:07:46 -08:00

extension_edit.php

Update extension_edit.php

2015-10-29 12:24:24 -07:00

extensions.php

extension download

2015-12-10 15:07:46 -08:00

root.php

…