Merge pull request #19858 from nextcloud/feature/webauthn

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Tue, 31 Mar 2020 20:55:13 +0000 (22:55 +0200)

committer GitHub <noreply@github.com>

Tue, 31 Mar 2020 20:55:13 +0000 (22:55 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Tue, 31 Mar 2020 20:55:13 +0000 (22:55 +0200)
committer GitHub <noreply@github.com>
Tue, 31 Mar 2020 20:55:13 +0000 (22:55 +0200)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Tue, 31 Mar 2020 20:55:13 +0000 (22:55 +0200)
committer	GitHub <noreply@github.com>
	Tue, 31 Mar 2020 20:55:13 +0000 (22:55 +0200)
		1	2
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history