Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup

This commit is contained in:
Michael Vogel 2016-02-13 20:12:31 +01:00
commit 9261154eab
483 changed files with 23212 additions and 10894 deletions

View file

@ -17,6 +17,8 @@
* easily as email does today.
*/
require_once('include/autoloader.php');
require_once('include/config.php');
require_once('include/network.php');
require_once('include/plugin.php');