aboutsummaryrefslogtreecommitdiff
path: root/mod/oauth_api
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-12-22 08:12:07 -0500
committerCash Costello <cash.costello@gmail.com>2011-12-22 08:12:07 -0500
commite49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch)
tree6f485b560f89331c65fad3993e055a1834b07177 /mod/oauth_api
parent5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff)
parentfea599f1653d7206e34ac33c0c0a668cb587bc20 (diff)
downloadelgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz
elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2
Merge branch '1.8' after 1.8.2 release
Conflicts: version.php
Diffstat (limited to 'mod/oauth_api')
-rw-r--r--mod/oauth_api/manifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index efd3d944f..991be6a22 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -18,4 +18,8 @@
<type>plugin</type>
<name>oauth_lib</name>
</conflicts>
+ <conflicts>
+ <type>php_extension</type>
+ <name>oauth</name>
+ </conflicts>
</plugin_manifest>