Merge branch 'release'

* release:
  lib/model: Add initial noop watch cancel func (fixes #4464)
  vendor: Fix kcp deadlock
This commit is contained in:
Jakob Borg 2017-10-28 10:04:28 +02:00
commit 997bed569e

Diff Content Not Available