Merge https://github.com/friendica/red into zpull

2013-06-08 16:30:50 -07:00
parent ee1ecd8ea2 4132cab862
commit 80be209bce
3 changed files with 10 additions and 6 deletions
--- a/mod/import.php
+++ b/mod/import.php
@@ -5,6 +5,7 @@

 require_once('include/Contact.php');
 require_once('include/zot.php');
+require_once('include/identity.php');

 function import_post(&$a) {