wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/lib/ocs
History
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
..
activity.php Merge branch 'master' into ocs_api 2012-12-31 15:47:15 +00:00
cloud.php Merge branch 'master' into ocs_api 2012-12-31 15:47:15 +00:00
config.php API: Remove old code. Move remaining methods to OC_OCS_Result. 2012-12-12 18:06:07 +00:00
person.php Merge branch 'master' into ocs_api 2012-12-31 15:47:15 +00:00
privatedata.php Merge branch 'master' into ocs_api 2012-12-31 15:47:15 +00:00
result.php Merge branch 'master' into ocs_api 2012-12-31 15:47:15 +00:00