summaryrefslogtreecommitdiffstats
path: root/core/ajax/grouplist.php
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-07-11 20:25:59 -0400
committerMichael Gapczynski <mtgap@owncloud.com>2012-07-11 20:25:59 -0400
commit4bf13adff25f012c735931c0578b1f5d0790bdbe (patch)
treea7c5451ff25e2f39936ae984ceb5b3b9eb519088 /core/ajax/grouplist.php
parent88f4845ca33fd6f2988f230116e2190d15ab1866 (diff)
parent8890a4128015df0ad57101703d6c164ea54fe4ee (diff)
downloadnextcloud-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 'core/ajax/grouplist.php')
-rw-r--r--core/ajax/grouplist.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
index cc15102bbc3..e3e92fcfa16 100644
--- a/core/ajax/grouplist.php
+++ b/core/ajax/grouplist.php
@@ -45,5 +45,3 @@ foreach( OC_Group::getGroups() as $i ){
}
OC_JSON::encodedPrint($groups);
-
-?>