[webauthn] new commits pushed by equalsJeffH

The following commits were just pushed by equalsJeffH to https://github.com/w3c/webauthn:

* fix conflicts fer real this time (i hope)
  by JeffH
https://github.com/w3c/webauthn/commit/371c876c77c1dfbb35ae2b24953eb674e7ee7c6b

Received on Monday, 1 May 2017 19:20:44 UTC