fix(conflict-resolve): thumbnail generation - #17424

fix(conflict-resolve): thumbnail generation#17424

alperozturk96 wants to merge 2 commits into

masternextcloud/android:masterfrom

fix/thumbnail-generation-conflict-resolvenextcloud/android:fix/thumbnail-generation-conflict-resolveCopy head branch name to clipboard