diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-11 20:25:59 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-11 20:25:59 -0400 |
| commit | 4bf13adff25f012c735931c0578b1f5d0790bdbe (patch) | |
| tree | a7c5451ff25e2f39936ae984ceb5b3b9eb519088 /settings/apps.php | |
| parent | 88f4845ca33fd6f2988f230116e2190d15ab1866 (diff) | |
| parent | 8890a4128015df0ad57101703d6c164ea54fe4ee (diff) | |
| download | nextcloud-server-4bf13adff25f012c735931c0578b1f5d0790bdbe.tar.gz nextcloud-server-4bf13adff25f012c735931c0578b1f5d0790bdbe.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'settings/apps.php')
| -rw-r--r-- | settings/apps.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/settings/apps.php b/settings/apps.php index f4ae8b8d977..762395c031b 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -97,5 +97,3 @@ $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):''); $tmpl->assign('appid',$appid); $tmpl->printPage(); - -?> |