summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-10-30 21:45:22 +0000
committerSarven Capadisli <csarven@status.net>2009-10-30 21:45:22 +0000
commita2302e5b76b827f906c5ded028e7c120c6200b76 (patch)
tree0c0d3af1c94cfde82074191301870f56624f6b5c /classes
parentdb9aef9f67a9448e73f6ee3463329045e41084f3 (diff)
parentb7ed31c27bc883b7b7b6a9af6391aacd8d897d78 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes')
-rw-r--r--classes/statusnet.ini10
1 files changed, 10 insertions, 0 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 7931c7bcd..623790b10 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -537,6 +537,16 @@ modified = 384
canonical = K
display = U
+[user_openid_trustroot]
+trustroot = 130
+user_id = 129
+created = 142
+modified = 384
+
+[user_openid__keys]
+trustroot = K
+user_id = K
+
[user_role]
user_id = 129
role = 130