diff options
| author | Brion Vibber <brion@pobox.com> | 2010-09-30 11:31:29 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-09-30 11:31:29 -0700 |
| commit | 20f2167425fcbdca3281960297a0a006f4efbddf (patch) | |
| tree | 22eae18225dbcef59592b411ffb8bbd5b3e253ed /classes/File_oembed.php | |
| parent | 1acc7d66c63e0b9f794791e3a2e2b0f60bc2ebb1 (diff) | |
| parent | 49611af76de5fca165edd79acefa09851706f8cd (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
Diffstat (limited to 'classes/File_oembed.php')
| -rw-r--r-- | classes/File_oembed.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/File_oembed.php b/classes/File_oembed.php index 041b44740..4813d5dda 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -131,4 +131,3 @@ class File_oembed extends Memcached_DataObject } } } - |