Merge pull request #31866 from nextcloud/test-avatar-migration

author Pytal <24800714+Pytal@users.noreply.github.com>

Mon, 11 Apr 2022 17:45:40 +0000 (10:45 -0700)

committer GitHub <noreply@github.com>

Mon, 11 Apr 2022 17:45:40 +0000 (10:45 -0700)
author Pytal <24800714+Pytal@users.noreply.github.com>
Mon, 11 Apr 2022 17:45:40 +0000 (10:45 -0700)
committer GitHub <noreply@github.com>
Mon, 11 Apr 2022 17:45:40 +0000 (10:45 -0700)
diff --cc apps/settings/tests/UserMigration/AccountMigratorTest.php
Simple merge
author	Pytal <24800714+Pytal@users.noreply.github.com>
	Mon, 11 Apr 2022 17:45:40 +0000 (10:45 -0700)
committer	GitHub <noreply@github.com>
	Mon, 11 Apr 2022 17:45:40 +0000 (10:45 -0700)