diff options
| author | Raul <raul@nextcloud.com> | 2022-05-02 18:14:08 +0300 |
|---|---|---|
| committer | Raul <raul@nextcloud.com> | 2022-05-02 18:14:08 +0300 |
| commit | 102df3a6f580deea40e9dce25cd563ee753025eb (patch) | |
| tree | b3f6a5ab3e33545315ae1413973eec91555ef1a5 /l10n/es.json | |
| parent | 5a3c90dae931bfa70b0f86b18a07e92f81aee559 (diff) | |
| parent | 67e2bb4b6ea9190f2405d8328ca782412afdbde9 (diff) | |
Merge branch 'master' into enh/file_versions/fix_behaviourenh/file_versions/fix_behaviour
Signed-off-by: Raul <raul@nextcloud.com>
# Conflicts:
# lib/Backgroundjobs/Cleanup.php
# lib/Db/WopiMapper.php
Diffstat (limited to 'l10n/es.json')
0 files changed, 0 insertions, 0 deletions