diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-18 12:17:11 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-18 12:17:11 -0700 |
| commit | 7765ddae81e9b29af06009d961b3d56b293f527c (patch) | |
| tree | 0878a6c3341683966343af3ceaba682b3526c2de /actions/showstream.php | |
| parent | e0cb6d6f7fdda97cb6ed262f79706392e315c055 (diff) | |
| parent | e04a6ef93ef7706671ba14f5108690bfe12c1592 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
README
lib/default.php
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index b2082eb4b..8178dafb1 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -269,7 +269,7 @@ class ProfileNoticeList extends NoticeList } } -class ProfileNoticeListItem extends NoticeListItem +class ProfileNoticeListItem extends DoFollowListItem { function showAuthor() { |