Nabin Hait 2b682c82e8 Fixed merge conflict

2018-04-04 11:40:16 +05:30

..

doctype

Fixed merge conflict

2018-04-04 11:40:16 +05:30

report

Fixed merge conflict

2018-03-23 16:20:27 +05:30

web_form

…

__init__.py

…

api.py

Fixed translations and tests (#12900)

2018-02-14 17:44:06 +05:30

setup.py

…

utils.py

…