fix merge conflict 0.7.x 0.8.x in util.php and register.php.

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 7b2dcacc5045256864c8977f68b51c9f8473f428..4f93829601e267c2a381cbdf6bc068008c295aea 100644 (file)
--- a/README
+++ b/README
@@ -176,6 +176,10 @@ and the URLs are listed here for your convenience.
   version may render your Laconica site unable to send or receive XMPP
   messages.
 - Facebook library. Used for the Facebook application.
+- PEAR Services_oEmbed. Used for some multimedia integration.
+- PEAR HTTP_Request is an oEmbed dependency.
+- PEAR Validat is an oEmbed dependency.e
+- PEAR Net_URL is an oEmbed dependency.2
 
 A design goal of Laconica is that the basic Web functionality should
 work on even the most restrictive commercial hosting services.