summaryrefslogtreecommitdiff
path: root/classes/statusnet.ini
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-29 12:48:59 -0800
committerEvan Prodromou <evan@status.net>2009-12-29 12:48:59 -0800
commita1b130541b75d774faee663e3ab1c5c9044a5849 (patch)
tree701b22feb257bf37ee54b0dcff541747b84aba82 /classes/statusnet.ini
parent05e2b4d92d9e646ac17871424d47e81c09acf4b2 (diff)
parente152bec2822a4ec773d02dd05f080a049ff3d524 (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.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 35a000aac..4077746c4 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -572,5 +572,5 @@ created = 142
modified = 384
[user_location_prefs__keys]
-user_id = N
+user_id = U