Tony Murray 28216f67b0 Merge branch 'master' into config_diff

2016-02-12 10:36:18 -06:00

..

alerting.inc.php

Added missing from email settings field

2016-02-11 22:11:07 +00:00

external.inc.php

Remove $config['oxidized']['features']['versioning']. I did not update the schema to remove the entry from the config table.

2016-02-12 10:23:49 -06:00