diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
| commit | 46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3 (patch) | |
| tree | 78896053233f385afbdc6006eade163626048bf6 /apps/files/appinfo | |
| parent | 7d2a68fc314bcefa69413d85e69ffd10dc34ddc5 (diff) | |
| parent | 3a184e2e1d7ae49d596e06b724ffc36382d02596 (diff) | |
| download | nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.tar.gz nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/appinfo')
| -rw-r--r-- | apps/files/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/files/appinfo/remote.php | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 2abf54e7da6..03076dee98c 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -6,5 +6,6 @@ <licence>AGPL</licence> <author>Robin Appelman</author> <require>2</require> + <standalone/> <default_enable/> </info> diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 0f618c391ad..94ae101bb00 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -22,11 +22,9 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ - // only need filesystem apps $RUNTIME_APPTYPES=array('filesystem','authentication'); - - +require_once('../lib/base.php'); // Backends $authBackend = new OC_Connector_Sabre_Auth(); |