Makarand Bauskar 98b52a7245 resolved merge conflicts on develop (#10185) ...

* resolved merge conflicts on develop

* [minor] removed the validate_activity

2017-07-31 15:09:52 +05:30

..

doctype

resolved merge conflicts on develop (#10185)

2017-07-31 15:09:52 +05:30

report

added roles in the report

2017-03-06 14:26:09 +05:30

web_form

…

__init__.py

…

utils.py

…