diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
commit | fc76a13c520d1d5345c721e0616d770e1fd344ea (patch) | |
tree | 1dc8e108588a52182e0c8c346423aab171e66944 /l10n/et_EE/files_external.po | |
parent | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (diff) | |
parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
download | nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.tar.gz nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.zip |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/public/share.php
Diffstat (limited to 'l10n/et_EE/files_external.po')
0 files changed, 0 insertions, 0 deletions