Merge branch '0.9.x' into 1.0.x

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

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 9916384fd95f1f0ba082902446f50e78f1df47b4..bcff744bdffd133f1439a7a69bc15d324a6b82d5 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -353,7 +353,7 @@ notice_id = K
 id = 129
 owner = 129
 consumer_key = 130
-name = 2
+name = 130
 description = 2
 icon = 130
 source_url = 2
@@ -580,6 +580,7 @@ modified = 384
 
 [user_group__keys]
 id = N
+nickname = U
 
 [user_openid]
 canonical = 130