Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 8572ea8ac5335ea9b27f9d37d0993ff48447259d..b2509dac5bc36cb199ebd0282ab22d4f1e1fe295 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -253,6 +253,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
@@ -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
@@ -524,24 +542,4 @@ created = 142
 modified = 384
 
 [user_group__keys]
-id = N
-
-[user_role]
-user_id = 129
-role = 130
-created = 142
-
-[user_role__keys]
-user_id = K
-role = K
-
-[login_token]
-user_id = 129
-token = 130
-created = 142
-modified = 384
-
-[login_token__keys]
-user_id = K
-token = K
-
+id = N
\ No newline at end of file