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

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

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index e28424ce2a3f00d7b3060f77cbc4b065593901d8..a535159e808b26919b426c3dd95682ae012156bd 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 = 130
+name = 2
 description = 2
 icon = 130
 source_url = 2
@@ -367,6 +367,7 @@ modified = 384
 
 [oauth_application__keys]
 id = N
+name = U
 
 [oauth_application_user]
 profile_id = 129