summaryrefslogtreecommitdiff
path: root/lib/accountsettingsaction.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-16 16:23:57 -0800
committerZach Copley <zach@status.net>2010-02-16 16:23:57 -0800
commitb2a502b33616cdcbf23a8bccd32f75d17c95a713 (patch)
tree7d6f700a670522571e850ea16cb8c449f1f687b1 /lib/accountsettingsaction.php
parentc892726c80b4e466b2bbad0f7b396cf0c7a137d9 (diff)
parent4a139d1cc861272b45812969878fa62f81ed9cfe (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: OStatus: migrated notice parsing to use Activity helper classes; on the way to killing FeedMunger
Diffstat (limited to 'lib/accountsettingsaction.php')
0 files changed, 0 insertions, 0 deletions