Commit 20b07e07 authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'sv/master'

# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
parents 092423ad 02199c8c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment