Merge branch '0.9.x' into cacheplugin

[quix0rs-gnu-social.git] / classes / statusnet.ini

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 7931c7bcdf265a29a8faaf8d8cb39877ebbc9e84..4077746c47035bcf1c58ca17ef76f193e660f654 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -1,4 +1,3 @@
-
 [avatar]
 profile_id = 129
 original = 17
@@ -253,6 +252,15 @@ modified = 384
 [location_namespace__keys]
 id = K
 
+[login_token]
+user_id = 129
+token = 130
+created = 142
+modified = 384
+
+[login_token__keys]
+user_id = K
+
 [message]
 id = 129
 uri = 2
@@ -298,6 +306,7 @@ lat = 1
 lon = 1
 location_id = 1
 location_ns = 1
+repeat_of = 1
 
 [notice__keys]
 id = N
@@ -358,6 +367,15 @@ modified = 384
 blocker = K
 blocked = K
 
+[profile_role]
+profile_id = 129
+role = 130
+created = 142
+
+[profile_role__keys]
+profile_id = K
+role = K
+
 [profile_tag]
 tagger = 129
 tagged = 129
@@ -537,11 +555,22 @@ modified = 384
 canonical = K
 display = U
 
-[user_role]
+[user_openid_trustroot]
+trustroot = 130
 user_id = 129
-role = 130
 created = 142
+modified = 384
 
-[user_role__keys]
+[user_openid__keys]
+trustroot = K
 user_id = K
-role = K
+
+[user_location_prefs]
+user_id = 129
+share_location = 17
+created = 142
+modified = 384
+
+[user_location_prefs__keys]
+user_id = U
+