9d504e4706
Conflicts: home/page/latest_updates/latest_updates.js setup/doctype/price_list/price_list.txt
Conflicts: home/page/latest_updates/latest_updates.js setup/doctype/price_list/price_list.txt