Saurabh 2735701aab resolved merge conflicts

2018-02-14 11:51:09 +05:30

..

__init__.py

Changed company name from Web Notes to Frappe Technologies

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

boot.py

[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)

2017-11-02 18:12:14 +05:30

notifications.py

resolved merge conflicts

2018-02-14 11:51:09 +05:30

report_data_map.py

[domain] Healthcare (#10664)

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