Merge pull request #22218 from nextcloud/enh/sse/make_legacy_cipher_opt_in

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

Wed, 19 Aug 2020 18:10:45 +0000 (20:10 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Aug 2020 18:10:45 +0000 (20:10 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Wed, 19 Aug 2020 18:10:45 +0000 (20:10 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Aug 2020 18:10:45 +0000 (20:10 +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>
	Wed, 19 Aug 2020 18:10:45 +0000 (20:10 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Aug 2020 18:10:45 +0000 (20:10 +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