Commit db732926 authored by Your Name's avatar Your Name

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/notification_common_small.xml
parents a0f24d80 351bbf91
Pipeline #1383 canceled with stages