Matthew Vale 665824b949 Merge branch 'fusionpbx/master' into Enhance-Languages ... Conflicts: app/extensions/app_languages.php		2015-12-11 08:45:26 +00:00
..
accessible	Added initial version of app/languages	2015-12-10 10:04:35 +00:00
enhanced	Merge branch 'fusionpbx/master' into Enhance-Languages	2015-12-11 08:45:26 +00:00
flags	Initial consolidation of common terms	2015-12-10 10:06:48 +00:00
minimized	Added initial version of app/languages	2015-12-10 10:04:35 +00:00