Arvind Tiwari d0e770d0df merge conflict resolved		2017-08-31 23:47:42 +05:30
..
django.po	merge conflict resolved	2017-08-31 23:47:42 +05:30