diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-31 12:58:12 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-31 12:58:12 +0200 |
| commit | 1bfe975938e96f462afe5ef5e5ebc75735767711 (patch) | |
| tree | 041bb3fe5f9cbd8ccff3fcacd2d629287b7d0410 /l10n/ms_MY/files.po | |
| parent | 96ef926161155cf710838612501bf76756f89cb4 (diff) | |
| parent | d636e168a6c043ddae730f7cdaaee772b1067793 (diff) | |
| download | nextcloud-server-1bfe975938e96f462afe5ef5e5ebc75735767711.tar.gz nextcloud-server-1bfe975938e96f462afe5ef5e5ebc75735767711.zip | |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/lib/util.php
Diffstat (limited to 'l10n/ms_MY/files.po')
| -rw-r--r-- | l10n/ms_MY/files.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index 96c99f7296e..8222cf64ba1 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-29 23:36+0000\n" +"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"PO-Revision-Date: 2013-05-30 23:15+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" |