summaryrefslogtreecommitdiff
path: root/plugins/OStatus
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-09-03 18:01:08 -0700
committerBrion Vibber <brion@pobox.com>2010-09-03 18:01:08 -0700
commit58b5ff718a5fa209dce5dd23d6d0fb35d30facd6 (patch)
tree14886167c3e37872c48cf2fd76cd284fb85c3220 /plugins/OStatus
parentab0ced4dfd22ae153c835a90cab36a037e6a6b72 (diff)
parentcc6e4c93e5085b21b7f7b5cbdecc42ffc470ffae (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus')
0 files changed, 0 insertions, 0 deletions