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

@ -18,7 +18,6 @@ require_once("include/event.php");
require_once("include/text.php");
require_once("include/oembed.php");
require_once("include/html2bbcode.php");
require_once("library/HTMLPurifier.auto.php");
/**
* @brief This class contain functions to create and send DFRN XML files