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

2013-06-29 02:07:26 -07:00
parent 28e0665cad 54b8c6ce36
commit 070aeeefd6
1 changed files with 2 additions and 1 deletions
--- a/include/settings.php
+++ b/include/settings.php
@@ -5,6 +5,7 @@
 * such things as personal settings, channel permissions, address book updates, etc.
 */

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

 function build_sync_packet($uid = 0, $packet = null) {
 	$a = get_app();