summaryrefslogtreecommitdiff
path: root/classes/statusnet.ini
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-11 09:55:47 -0500
committerEvan Prodromou <evan@status.net>2009-12-11 09:55:47 -0500
commite9b733e7f036bc03353ae6dd7b096ea179698a4d (patch)
tree1f93b0344e3d5b7c1e50f9ee272c8dc8d8ecf8c6 /classes/statusnet.ini
parent78fc9483d4d1fde4561905edf6594b86c4dc374e (diff)
parent85473ecf94e92cd0e6503e4d27ea26452076aafd (diff)
Merge branch '0.9.x' into testing
Diffstat (limited to 'classes/statusnet.ini')
-rw-r--r--classes/statusnet.ini1
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 5c942c63a..f12707ba1 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -260,7 +260,6 @@ modified = 384
[login_token__keys]
user_id = K
-token = K
[message]
id = 129