upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-10 10:21:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
11846 commits 742 branches 1186 tags 6.5 GiB
Commit graph

3 commits

Author SHA1 Message Date
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
Bart Visscher
28537037ae Fixup OCS modules 2012-07-31 22:19:11 +02:00
Tom Needham
9072106048 Move OCS methods to lib/ocs/.php 2012-07-30 12:42:18 +00:00