Ozzie Isaacs a6d1f6039d Merge remote-tracking branch 'es/spanish-translation' into master ... # Conflicts: # cps/translations/es/LC_MESSAGES/messages.po		2021-06-29 18:30:37 +02:00
..
messages.mo	Merge remote-tracking branch 'es/spanish-translation' into master	2021-06-29 18:30:37 +02:00
messages.po	Merge remote-tracking branch 'es/spanish-translation' into master	2021-06-29 18:30:37 +02:00