diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-28 11:00:49 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-28 11:00:49 +0200 |
| commit | 09b54ccb2b01c558b1d9ccad1e335492d97b4fe1 (patch) | |
| tree | 5962c534191376de8457e7d1a345e52210794d26 /l10n/cy_GB/files_sharing.po | |
| parent | 3a76c22372654bacb5c33a927779be06baca616e (diff) | |
| parent | 086c33ef57ddddcad84e9cb21c9e24b5a4c43a5d (diff) | |
| download | nextcloud-server-09b54ccb2b01c558b1d9ccad1e335492d97b4fe1.tar.gz nextcloud-server-09b54ccb2b01c558b1d9ccad1e335492d97b4fe1.zip | |
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
Diffstat (limited to 'l10n/cy_GB/files_sharing.po')
| -rw-r--r-- | l10n/cy_GB/files_sharing.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po index e28365980af..0c7f401ee0f 100644 --- a/l10n/cy_GB/files_sharing.po +++ b/l10n/cy_GB/files_sharing.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-27 02:00+0200\n" -"PO-Revision-Date: 2013-05-26 23:16+0000\n" +"POT-Creation-Date: 2013-05-28 02:01+0200\n" +"PO-Revision-Date: 2013-05-27 23:17+0000\n" "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" |