diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
| commit | 6eb194b70284d527a182756f2c7a21f3d7dc1fe8 (patch) | |
| tree | e70635e44cc4fccbbde34bed1a01fd50fcd183cf /lib/MDB2/Driver/Native | |
| parent | 218a5ea89014322592bd8c4789d8500d42029b9f (diff) | |
| parent | 329bddab481129b480ca187b694e507eff7fb125 (diff) | |
| download | nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.tar.gz nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.zip | |
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
Diffstat (limited to 'lib/MDB2/Driver/Native')
0 files changed, 0 insertions, 0 deletions