diff options
| author | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
|---|---|---|
| committer | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
| commit | 2bfad189e7e9c8ea78e4b5f78c9e779074dd991c (patch) | |
| tree | 697204517c95647e382a4723545ade3950420913 /lib/base.php | |
| parent | e69079f9354464d21f31ae8b6d9e47988ba22fb4 (diff) | |
| parent | d12d08e2f3553b06df6371535f971c9f193bd388 (diff) | |
| download | nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.tar.gz nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.zip | |
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
lib/base.php
lib/filestorage.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 0c0921ca8b1..4e1b9bd0064 100644 --- a/lib/base.php +++ b/lib/base.php @@ -110,6 +110,3 @@ OC_UTIL::addStyle( "styles" ); if(!$error and !$RUNTIME_NOAPPS ){ OC_APP::loadApps(); } - - -?> |