diff options
| author | Zach Copley <zach@status.net> | 2010-02-16 20:14:33 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-16 20:14:33 -0800 |
| commit | 5886e9621737c0712b9957edf716b554e04d0ce0 (patch) | |
| tree | 1ac7a2a1a858dbed6b26e8d6a862b5152a2c1286 /classes/Conversation.php | |
| parent | 2cb243808c2c1540f2690bff5a2d9932fa428923 (diff) | |
| parent | e51e96d7248b281e7d0e59f5a9bdcd4e7e651e82 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: override source link with the source domain and link to original message
OStatus: moving parts of profile processing to Activity from feedmunger. Pausing before refactoring DB schema a bit to clean up feed vs person vs group info
Diffstat (limited to 'classes/Conversation.php')
0 files changed, 0 insertions, 0 deletions