diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:40:35 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:40:35 +0100 |
commit | bae175518427de1f43ac23dbc1e06a15f6933370 (patch) | |
tree | 90cdee24789526b1b6da16eda90e2c1547a66e62 /apps/user_webdavauth/l10n/ru.php | |
parent | 39d874cd902a4e3d4f7ae313ec5e15bafe35df13 (diff) | |
parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
download | nextcloud-server-bae175518427de1f43ac23dbc1e06a15f6933370.tar.gz nextcloud-server-bae175518427de1f43ac23dbc1e06a15f6933370.zip |
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
Diffstat (limited to 'apps/user_webdavauth/l10n/ru.php')
-rw-r--r-- | apps/user_webdavauth/l10n/ru.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php index 9bd32954b05..245a5101341 100644 --- a/apps/user_webdavauth/l10n/ru.php +++ b/apps/user_webdavauth/l10n/ru.php @@ -1,3 +1,3 @@ <?php $TRANSLATIONS = array( -"WebDAV URL: http://" => "WebDAV URL: http://" +"URL: http://" => "URL: http://" ); |