upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-05 17:16:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31
nextcloud/apps
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
..
files [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
files_encryption [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
files_external [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
files_sharing Merge branch 'master' into ocs_api 2012-12-31 15:47:15 +00:00
files_versions [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
user_ldap [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
user_webdavauth [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00