Commit Graph

2 Commits

Author SHA1 Message Date
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
2013-08-12 20:00:33 +05:30