diff options
| author | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
| commit | 9f4da6d87f2c520b975f968cedbcde4f3dce1a25 (patch) | |
| tree | fee953cf498b6083faf56c61042d3bee07110331 /mod/oauth_api | |
| parent | a22660e997611fe2afb97689ea23774578ee80db (diff) | |
| parent | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (diff) | |
| download | elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.gz elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.bz2 | |
Merge git://github.com/Elgg/Elgg
Diffstat (limited to 'mod/oauth_api')
| -rw-r--r-- | mod/oauth_api/manifest.xml | 4 |
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> |