Commit ab5d8758 authored by Aaditya Prakash's avatar Aaditya Prakash

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/values-de/strings.xml
parents a8b1fc4e 5b479fc7
Pipeline #35300 passed with stages
in 3 minutes and 59 seconds