Frisk 99669a1702 Merge branch '1.14' into testing ... # Conflicts: # locale/de/LC_MESSAGES/rc_formatters.mo # locale/fr/LC_MESSAGES/discussion_formatters.mo # locale/fr/LC_MESSAGES/discussion_formatters.po # locale/fr/LC_MESSAGES/misc.po # locale/fr/LC_MESSAGES/rc_formatters.mo # locale/hi/LC_MESSAGES/rc_formatters.mo # locale/pl/LC_MESSAGES/rc_formatters.mo # locale/pt-br/LC_MESSAGES/rc_formatters.mo # locale/ru/LC_MESSAGES/rc_formatters.mo # locale/uk/LC_MESSAGES/rc_formatters.mo # locale/zh-hans/LC_MESSAGES/rc_formatters.mo		2021-05-20 21:04:24 +02:00
..
LC_MESSAGES	Merge branch '1.14' into testing	2021-05-20 21:04:24 +02:00