summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-02 00:38:50 -0800
committerZach Copley <zach@status.net>2010-03-02 00:38:50 -0800
commitf68e3dfba5a1b745aceaf07bed8b92c53f3708aa (patch)
tree36f68a3b1737a599371310390215f92c1052aa42 /COPYING
parent9816b35063b75f1aa051d8b1ecefe716d99f5dc4 (diff)
parent40ac7247979dc6f33f56b20c907d55deb6b9c815 (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: don't duplicate title in summary in Atom output per RFC4287 4.2.13 Show <activity:subject> and no activity actors for user feed Revert "show service debug info"
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions