summaryrefslogtreecommitdiffstats
path: root/settings/l10n/ja.json
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-05-07 16:29:42 +0200
committerGitHub <noreply@github.com>2018-05-07 16:29:42 +0200
commit7bf713edafa0ef2637f42f3b02e22fc89e19b9ee (patch)
tree223675c5d2a4916170bef2d86e655600ef784ad9 /settings/l10n/ja.json
parent284b23333d50651c249511920b2f6862844c9432 (diff)
parentbc1a17a9e2ac415ce4eb63a49804699a023b1892 (diff)
downloadnextcloud-server-7bf713edafa0ef2637f42f3b02e22fc89e19b9ee.tar.gz
nextcloud-server-7bf713edafa0ef2637f42f3b02e22fc89e19b9ee.zip
Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13
[13] Log lock state on conflict
Diffstat (limited to 'settings/l10n/ja.json')
0 files changed, 0 insertions, 0 deletions