Merge branch 'master' into develop

This commit is contained in:
Tobias Diekershoff 2019-01-21 10:04:26 +01:00
commit 08206fdcc0
29 changed files with 135 additions and 133 deletions

View file

@ -9,8 +9,6 @@
*
*/
require_once 'include/text.php';
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;