Nabin Hait 406f0a38de Fixed merge conflicts

2016-09-05 15:44:18 +05:30

..

doctype

[minor] new global for query report filters

2016-09-01 17:53:42 +05:30

report

Minor fixes

2016-09-05 11:51:45 +05:30

web_form

Merge pull request #6007 from KanchanChauhan/task-json-fixed

2016-08-06 13:42:50 +05:30

__init__.py

…

utils.py

…