Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration ... Conflicts: core/js/share.js lib/util.php		2012-09-12 01:06:57 -04:00
..
app.php	style fixes for public app api	2012-09-08 15:54:30 +02:00
backgroundjob.php	adding space between) and {	2012-09-07 15:22:01 +02:00
config.php	style fixes for public config api	2012-09-08 15:58:28 +02:00
db.php	style fixes for public db api	2012-09-08 16:00:32 +02:00
files.php	style fixes for public files api	2012-09-08 16:02:11 +02:00
groupinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
json.php	style fixes for public json api	2012-09-08 16:14:06 +02:00
response.php	style fixes for public response api	2012-09-08 16:15:42 +02:00
share.php	Merge branch 'master' into share_expiration	2012-09-12 01:06:57 -04:00
template.php	adding space between) and {	2012-09-07 15:22:01 +02:00
user.php	style fixes for public user api	2012-09-08 16:17:01 +02:00
userinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
util.php	style fixes for public util api	2012-09-08 16:18:47 +02:00