summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions/feedsubsettings.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-21 14:44:28 -0800
committerZach Copley <zach@status.net>2010-02-21 14:44:28 -0800
commitca2a88545d353f0e887f48fe0e3bd43b505031ca (patch)
treee8b0d4ef406ce49a8df1991dc5d2abba14179111 /plugins/OStatus/actions/feedsubsettings.php
parent10281d59f4bf8298ff65792d1a7826913d96fafa (diff)
parentaa0b2ce81ad4a99fb55a36feda54e70bcd0808be (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions/feedsubsettings.php')
0 files changed, 0 insertions, 0 deletions