diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-23 10:25:12 -0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-23 10:25:12 -0400 |
commit | 30330b4343b5bca82b95d9df4a13651c8e91063d (patch) | |
tree | 68979fb843a309e43803935f53afe74fab2844e4 /l10n/de_DE/lib.po | |
parent | 3b6d850e592bbc6db9d67d25ee700c0730c84376 (diff) | |
parent | 698862519de6b364da6c20a97d8c546204e80f3d (diff) | |
download | nextcloud-server-30330b4343b5bca82b95d9df4a13651c8e91063d.tar.gz nextcloud-server-30330b4343b5bca82b95d9df4a13651c8e91063d.zip |
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
Diffstat (limited to 'l10n/de_DE/lib.po')
0 files changed, 0 insertions, 0 deletions