summaryrefslogtreecommitdiff
path: root/classes/statusnet.ini
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-02-04 16:56:34 +0000
committerSarven Capadisli <csarven@status.net>2010-02-04 16:56:34 +0000
commit7ebd13fa69d2a5dac8bc59799281d3d6e017eeae (patch)
tree605267bbe7c902d7a71766cdeb523bfbb266a0f9 /classes/statusnet.ini
parent339eb1adadc7f3495ad31ef0a5cf20cdca47ce1f (diff)
parent9e940445f1ab1ec53f3bad14a1a94dc2064d0ee6 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/statusnet.ini')
-rw-r--r--classes/statusnet.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 6203650a6..4ace4407b 100644
--- 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