mbauskar ea832b8157 resolved merge conflicts

2017-09-14 15:32:10 +05:30

..

__init__.py

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

boot.py

[fix] unset default customer group (#10689)

2017-09-14 15:03:45 +05:30

notifications.py

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

report_data_map.py

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30