summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-02-13 20:28:39 +0100
committerSarven Capadisli <csarven@status.net>2010-02-13 20:28:39 +0100
commit9465a4d5c6b77bd77e78bc277a817e2b5724ec76 (patch)
tree8533ad32339160d5ba3cf27209f78740ffa977cd /local
parent171bf3093a4cf3f3ff0b4d255392ffd5375e4c36 (diff)
parent269b4711eb1600597af314f2fdca00102ff5566a (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions