Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api ...

Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php

2012-08-14 10:22:13 -04:00

..

backend.php

Merge branch 'master' into share_api

2012-08-14 10:22:13 -04:00

database.php

Merge branch 'master' into share_api

2012-08-14 10:22:13 -04:00

dummy.php

Add search, limit, offset parameters to usersInGroups()

2012-08-11 16:25:28 -04:00

example.php

Add search, limit, offset parameters to usersInGroups()

2012-08-11 16:25:28 -04:00

interface.php

Add search, limit, offset parameters to usersInGroups()

2012-08-11 16:25:28 -04:00