summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-26 12:40:59 -0500
committerEvan Prodromou <evan@status.net>2010-02-26 12:40:59 -0500
commitfc576562a39943fb1fa83a6a6d1fdef4f234564a (patch)
tree9746f83e1f5b155cb7ebd07c4600428d37c18058 /classes
parent6781f95c733ed4d678fc4c09926efe195e590359 (diff)
parentb331e971b055386a126aaec27d661f26ba3b813c (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes')
-rw-r--r--classes/statusnet.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 719dbedf5..3fb8ee208 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -55,6 +55,7 @@ modified = 384
[conversation__keys]
id = N
+uri = U
[deleted_notice]
id = 129
@@ -102,6 +103,7 @@ modified = 384
[file__keys]
id = N
+url = U
[file_oembed]
file_id = 129
@@ -385,6 +387,7 @@ modified = 384
[oauth_application__keys]
id = N
+name = U
[oauth_application_user]
profile_id = 129