diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
| commit | 99194e03fa50b61f99164674afc949b4bbefd44a (patch) | |
| tree | 2d38f6ec4b1e6f314d925233c781315541772a0f /classes/File_oembed.php | |
| parent | 033a7570133d4183c2e162859e9b85fe7df3e40b (diff) | |
| parent | 71176b9a98ef5298162f821c621a0e467dd9570b (diff) | |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
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 } } } - |