diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 13:49:54 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 13:49:54 -0400 |
| commit | ea2385432817dcf5ad47396d83932f564aa76e4b (patch) | |
| tree | effc5c5489cf385ee79c73a4bea59605f53240f9 /lib/public | |
| parent | ba0cf9817526e1206a25a5fe6d70255ab3c9e3bc (diff) | |
| parent | fe6450002d6059260c743f48b6f40378454fa1dc (diff) | |
| download | nextcloud-server-ea2385432817dcf5ad47396d83932f564aa76e4b.tar.gz nextcloud-server-ea2385432817dcf5ad47396d83932f564aa76e4b.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/app.php b/lib/public/app.php index 5689f53ffb2..e74f1550740 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -46,7 +46,7 @@ class App { * */ public static function register( $data ){ - return \OC_App::register( $data ); + return true; // don't do anything } /** |