Merge remote-tracking branch 'sv/master'

# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
pull/1264/head
Ozzieisaacs 5 years ago
commit 20b07e0752

Diff Content Not Available