Willi Hohenstein c2c33fe1e8 fixed merge conflict		2022-02-02 20:20:16 +01:00
..
django.mo	Updates locales	2022-01-17 11:27:06 -08:00
django.po	fixed merge conflict	2022-02-02 20:20:16 +01:00