Remove unneeded Util/Security includings + Resolve including merge conflict with develop

This commit is contained in:
Jonny Tischbein 2018-10-17 21:52:08 +02:00
parent f3fc1f36ca
commit 0c0e17b7a7
2 changed files with 0 additions and 2 deletions

View File

@ -26,7 +26,6 @@ use Friendica\Util\Arrays;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use Friendica\Util\Network;
use Friendica\Util\Security;
require_once 'include/enotify.php';
require_once 'include/text.php';

View File

@ -16,7 +16,6 @@ use Friendica\Database\DBA;
use Friendica\Model\User;
use Friendica\Module\Tos;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Security;
require_once 'include/enotify.php';