tree 248d35ba656f31d918c6f8fe42297681be18e2bb
parent 97e2a7eeb9cd8bf2d5e702a2a54ac96871d5f80c
parent d7ad13a8a7d98e7977d25d1e8d2b1e281a3cdd2d
author Anand Doshi <anand@erpnext.com> 1367492146 +0530
committer Anand Doshi <anand@erpnext.com> 1367492146 +0530

Merge branch 'price_list_country'

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