Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db ... Conflicts: lib/vcategories.php		2012-11-05 12:06:59 +01:00
..
app.php	style fixes for public app api	2012-09-08 15:54:30 +02:00
backgroundjob.php	Style: Remove all the dangling white spaces	2012-11-04 22:16:04 +01:00
config.php	fix some more phpdoc	2012-09-23 02:40:03 +02:00
db.php	Merge branch 'master' of github.com:owncloud/core into vcategories_db	2012-11-04 12:31:06 +01: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	Style: Remove all the dangling white spaces	2012-11-04 22:16:04 +01: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	Checkstyle: fix the last NoSpaceAfterEquals	2012-11-04 18:31:44 +01:00