Tom Needham 6eb194b702 Merge branch 'master' into ocs_api ... Conflicts: l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot		2012-12-31 15:47:15 +00:00
..
api.php	Merge branch 'master' into ocs_api	2012-12-31 15:47:15 +00: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
constants.php	Added CRUDS permissions to the OCP namespace. Implements issue #345	2012-11-11 23:09:54 +01:00
contacts.php	More whitespace fixes	2012-12-15 00:43:46 +01: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
iaddressbook.php	[contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data	2012-12-11 17:42:09 +01: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 pull request #401 from owncloud/share_hooks	2012-11-28 04:35:52 -08:00
template.php	adding space between) and {	2012-09-07 15:22:01 +02:00
user.php	Add an $excludingBackend optional parameter	2012-12-07 17:19:26 +01:00
userinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
util.php	fixing variable name	2012-12-21 00:04:58 +01:00