[w3c/webauthn] 3e653f: merge from master and fix conflicts from =JeffH on 2019-06-26 (public-webauthn@w3.org from June 2019)

From: =JeffH <noreply@github.com>
Date: Wed, 26 Jun 2019 08:56:31 -0700
To: public-webauthn@w3.org
Message-ID: <w3c/webauthn/push/refs/heads/jeffh-fix-872-cleanup-refs/0d9f95-106a8c@github.co>

  Branch: refs/heads/jeffh-fix-872-cleanup-refs
  Home:   https://github.com/w3c/webauthn
  Commit: 3e653f368980eb200dd27bd19f58fc416f6f90e8
      https://github.com/w3c/webauthn/commit/3e653f368980eb200dd27bd19f58fc416f6f90e8
  Author: JeffH <jdhodges@google.com>
  Date:   2019-06-26 (Wed, 26 Jun 2019)

  Changed paths:

  Log Message:
  -----------
  merge from master and fix conflicts


  Commit: 106a8c00ce8db39c5ae0ae924af74df70c4f64a6
      https://github.com/w3c/webauthn/commit/106a8c00ce8db39c5ae0ae924af74df70c4f64a6
  Author: JeffH <jdhodges@google.com>
  Date:   2019-06-26 (Wed, 26 Jun 2019)

  Changed paths:

  Log Message:
  -----------
  Merge branch 'jeffh-fix-872-cleanup-refs' of https://github.com/w3c/webauthn into jeffh-fix-872-cleanup-refs


Compare: https://github.com/w3c/webauthn/compare/0d9f95e62d13...106a8c00ce8d

Received on Wednesday, 26 June 2019 15:56:54 UTC