diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-10-23 10:54:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 10:54:33 +0300 |
| commit | 6aef7f5ed5f4db526a81d9b47f5aa2a6a1c16d5a (patch) | |
| tree | 0d29434fcf968f6e4a95497ae9ab529a42b08b65 /CHANGELOG.md | |
| parent | 4a1090df93d24626377de43f2f34ba2dd4fa3e64 (diff) | |
| parent | 3b5386e4c60a3133569345e4082637d7d67bb08a (diff) | |
Merge pull request #4442 from nextcloud/backport/4374/stable20
[stable20] Only show the conflict warning when the session was in a call
Diffstat (limited to 'CHANGELOG.md')
0 files changed, 0 insertions, 0 deletions