]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 218a5ea 329bdda)
Merge branch 'master' into ocs_api
authorTom Needham <needham.thomas@gmail.com>
Mon, 31 Dec 2012 15:47:15 +0000 (15:47 +0000)
committerTom Needham <needham.thomas@gmail.com>
Mon, 31 Dec 2012 15:47:15 +0000 (15:47 +0000)
commit6eb194b70284d527a182756f2c7a21f3d7dc1fe8
treee70635e44cc4fccbbde34bed1a01fd50fcd183cftree | snapshot
parent218a5ea89014322592bd8c4789d8500d42029b9fcommit | diff
parent329bddab481129b480ca187b694e507eff7fb125commit | diff
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
lib/api.php diff1 | | blob | history
lib/ocs/activity.php diff1 | | blob | history
lib/ocs/cloud.php diff1 | | blob | history
lib/ocs/person.php diff1 | | blob | history
lib/ocs/privatedata.php diff1 | | blob | history
lib/ocs/result.php diff1 | | blob | history
lib/public/api.php diff1 | | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server