diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-11-29 15:38:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 15:38:24 +0100 |
| commit | f03aa0480abe3c7c8bd207b7e08e750d18fdb2ba (patch) | |
| tree | 01242dce6082861a54fcb652daf632e29e35f3d5 /l10n | |
| parent | 6097b74970b6a9cb87d79f0c9fd3aba01cd49aa7 (diff) | |
| parent | 0c457782199ea04eb9977c3baaebc843b0099e9a (diff) | |
| download | nextcloud-server-f03aa0480abe3c7c8bd207b7e08e750d18fdb2ba.tar.gz nextcloud-server-f03aa0480abe3c7c8bd207b7e08e750d18fdb2ba.zip | |
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
Fix silent conflicts due to merging #7256 after #7251
Diffstat (limited to 'l10n')
0 files changed, 0 insertions, 0 deletions