Matthew Vale 665824b949 Merge branch 'fusionpbx/master' into Enhance-Languages ...

Conflicts:
	app/extensions/app_languages.php

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

..

apps

First pass on core/*

2015-12-10 10:09:07 +00:00

databases

First pass on core/*

2015-12-10 10:09:07 +00:00

default_settings

First pass on core/*

2015-12-10 10:09:07 +00:00

domain_settings

First pass on core/*

2015-12-10 10:09:07 +00:00

events/resources/classes

Add FusionPBX events class.

2015-01-15 16:24:53 +00:00

install

Merge branch 'fusionpbx/master' into Enhance-Languages

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

menu

First pass on core/*

2015-12-10 10:09:07 +00:00

notifications

First pass on core/*

2015-12-10 10:09:07 +00:00

upgrade

First pass on core/*

2015-12-10 10:09:07 +00:00

user_settings

First pass on core/*

2015-12-10 10:09:07 +00:00

users

First pass on core/*

2015-12-10 10:09:07 +00:00