diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
| commit | bac2d80c919a78d5cafd57f712872a90cda04847 (patch) | |
| tree | d2df10a582edc0bf9e043f1c764953a290927678 /classes/statusnet.ini | |
| parent | 9a1a83e8ebe5ad39838e6363f1537a1a5232b9cb (diff) | |
| parent | 6a1afda259c5223449f679a64f932e36df5ebe39 (diff) | |
Merge branch '0.9.x' into adminpanel
Conflicts:
classes/User.php
Diffstat (limited to 'classes/statusnet.ini')
| -rw-r--r-- | classes/statusnet.ini | 61 |
1 files changed, 19 insertions, 42 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 912d05cdf..b2509dac5 100644 --- 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,45 +542,4 @@ created = 142 modified = 384 [user_group__keys] -id = N - -[user_openid] -canonical = 130 -display = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -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 -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 |