From 97e797427da01fffe3c85b17f41427469b33ca32 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sun, 14 Apr 2013 20:35:48 -0400
Subject: updated twitteroauth library to latest from github:
 https://github.com/abraham/twitteroauth/commit/61f5a550cd3643c619e84cb914ef1f22e491c270
 (note: now conflicts with oauth_api library)

---
 mod/twitter_api/manifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mod/twitter_api/manifest.xml')

diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 86bba4b50..3af866bba 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -2,7 +2,7 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
 	<name>Twitter API</name>
 	<author>Core developers</author>
-	<version>1.8</version>
+	<version>1.8.15</version>
 	<description>Allows users to authenticate their Elgg account with Twitter.</description>
 	<category>api</category>
 	<category>bundled</category>
@@ -13,15 +13,15 @@
 		<type>elgg_release</type>
 		<version>1.8</version>
 	</requires>
-	<requires>
-		<type>plugin</type>
-		<name>oauth_api</name>
-	</requires>
 	<requires>
 		<type>php_extension</type>
 		<name>curl</name>
 	</requires>
 
+	<conflicts>
+		<type>plugin</type>
+		<name>oauth_api</name>
+	</conflicts>
 	<conflicts>
 		<type>plugin</type>
 		<name>twitterservice</name>
-- 
cgit v1.2.3