Anand Doshi 4a3d3d75de Merge branch 'shf_rename' ...

Conflicts:
	erpnext/patches/patch_list.py

2012-05-14 12:53:29 +05:30

..

css

Merge branch 'shf_rename'

2012-05-14 12:53:29 +05:30

images

new cms with public folder

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

js

Merge branch 'shf_rename'

2012-05-14 12:53:29 +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

index.cgi

new cms with public folder

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

rss.xml

cms updates

2012-05-09 11:42:52 +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