summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-14 21:53:45 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-14 21:53:45 -0700
commit09c765f5bbc5a96415b82fe6a7d550d590d90747 (patch)
tree249dbaaa4c1a05a84554c8f9c0edbd652da153ef
parenta4055fc2f9a79aa9aa2321e132a7133c088859cd (diff)
parent23fd58b74c7d37b56c7fee897a485729061196d5 (diff)
Merge branch '0.8.x' into groupalias
-rw-r--r--[-rwxr-xr-x]classes/statusnet.ini0
1 files changed, 0 insertions, 0 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index a70cd4122..a70cd4122 100755..100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini