summaryrefslogtreecommitdiff
path: root/classes/status_network.ini
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-31 15:27:58 -0500
committerEvan Prodromou <evan@status.net>2010-01-31 15:27:58 -0500
commit779204b194447397d0770d96e291d9491fd731b9 (patch)
treed0bfe36cc2b743fce8507e8cf6851467ccec8789 /classes/status_network.ini
parentbd5278302574ae3af87f09e0d8191c95ab93582a (diff)
parent81087e45c5b797028e90181459e4c673cd7be278 (diff)
Merge branch 'testing' into 0.9.x
Conflicts: actions/apioauthauthorize.php
Diffstat (limited to 'classes/status_network.ini')
-rw-r--r--classes/status_network.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/status_network.ini b/classes/status_network.ini
index 8123265e4..adb71cba7 100644
--- a/classes/status_network.ini
+++ b/classes/status_network.ini
@@ -11,6 +11,7 @@ theme = 2
logo = 2
created = 142
modified = 384
+tags = 34
[status_network__keys]
nickname = K