]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b913de 0299ea0)
Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handling
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Tue, 26 Nov 2019 18:47:59 +0000 (19:47 +0100)
committerGitHub <noreply@github.com>
Tue, 26 Nov 2019 18:47:59 +0000 (19:47 +0100)
Handle token insert conflicts


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server