[stable-4.9.7] File conflict#148

TSI-amrutwaghmare wants to merge 1 commit intostable-4.9.7nextmcloud/ios:stable-4.9.7from

backport/nmc/103/stable-4.9.7nextmcloud/ios:backport/nmc/103/stable-4.9.7Copy head branch name to clipboard