diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 12:14:51 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 12:14:51 +0100 |
| commit | 4dea6a6228390713c0296dd6a447b9f60a211767 (patch) | |
| tree | e5f7840770ab4ea67f0a58d6642b6b75cfa05fda /l10n/ia/files_versions.po | |
| parent | 6aed7abfbe4a58cec822bdd16d8c71d4bac14c28 (diff) | |
| parent | 9ee5069f2a1d76c899eeef6cec0f06387764fabd (diff) | |
| download | nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.tar.gz nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.zip | |
Merge branch 'master' into trashbin_encryption
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
Diffstat (limited to 'l10n/ia/files_versions.po')
0 files changed, 0 insertions, 0 deletions