Anand Doshi c97f780940 Merge branch 'master' into dev ...

Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js

2012-07-12 22:16:19 +05:30

..

css

fixes to taxes and charges master and naming_series

2012-07-12 16:01:20 +05:30

images

new cms with public folder

2012-05-07 18:00:57 +05:30

js

Merge branch 'master' into dev

2012-07-12 22:16:19 +05:30

app.html

fix app.html

2012-05-09 14:25:16 +05:30

blank.html

new cms with public folder

2012-05-07 18:00:57 +05:30

rss.xml

cleaner web cache code

2012-07-12 18:41:12 +05:30

server.py

cms now powered by jinja2

2012-06-15 14:00:06 +05:30

sitemap.xml

cms updates

2012-05-09 11:42:52 +05:30

unsupported.html

new cms with public folder

2012-05-07 18:00:57 +05:30

web.py

cleaner web cache code

2012-07-12 18:41:12 +05:30