Henry Bravo a03f2f8f89 Fix conflicts		2017-06-13 10:36:39 -05:00
..
django.mo	Updated the translation for the modified text	2017-06-11 17:46:42 +05:30
django.po	Fix conflicts	2017-06-13 10:36:39 -05:00