Henry Bravo a7c28f5644 Fix conflic translates		2017-05-29 15:05:11 -05:00
..
django.mo	Fix conflic translates	2017-05-29 15:05:11 -05:00
django.po	Fix conflic translates	2017-05-29 15:05:11 -05:00