Anand Doshi 5be11b44ac Merge branch 'edge' of github.com:webnotes/erpnext into webshop ... Conflicts: controllers/buying_controller.py		2013-05-21 19:40:09 +05:30
..
images	desktop icons now use font-awesome	2012-12-21 15:00:29 +05:30
js	Merge branch 'edge' of github.com:webnotes/erpnext into webshop	2013-05-21 19:40:09 +05:30
build.json	[framework] [cleanup] desktop, todo, messages, modules setup moved to framework	2013-04-03 15:21:44 +05:30