diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
| commit | b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3 (patch) | |
| tree | f63f4f3e93bad7611f4b5651171fc5122ec65455 /lib/feedlist.php | |
| parent | 3b6f738ab73b7f77dd09ac21dd9446876776fc04 (diff) | |
| parent | ca489631db840e33757a71a7e4cb56b187c182d3 (diff) | |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'lib/feedlist.php')
| -rw-r--r-- | lib/feedlist.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/feedlist.php b/lib/feedlist.php index 4aacf0b3d..076576028 100644 --- a/lib/feedlist.php +++ b/lib/feedlist.php @@ -46,7 +46,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * * @see Action::showExportList() */ - class FeedList extends Widget { var $action = null; |