Saurabh 03f6b3e588 resolved merge conflicts

2018-01-29 16:25:33 +05:30

..

__init__.py

[refacator] added dashboard in item

2016-04-25 17:53:42 +05:30

item_dashboard_list.html

Update item_dashboard_list.html

2018-01-25 17:11:52 +05:30

item_dashboard.html

[refacator] added dashboard in item

2016-04-25 17:53:42 +05:30

item_dashboard.js

resolved merge conflicts

2018-01-29 16:25:33 +05:30

item_dashboard.py

[fix] #8427

2017-11-24 11:21:47 +05:30