Anand Doshi 59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge ... Conflicts: hr/doctype/leave_application/locale/_messages_py.json hr/doctype/leave_block_list/locale/_messages_doc.json public/js/locale/_messages_js.json setup/doctype/email_digest/locale/_messages_doc.json setup/doctype/global_defaults/global_defaults.txt		2013-02-21 11:09:43 +05:30
..
__init__.py	updates to website: removed webnotes.cms	2012-12-07 12:44:45 +05:30
blog_feed.py	updates to website: removed webnotes.cms	2012-12-07 12:44:45 +05:30
blog.py	refactored blog client-side code	2012-12-17 12:52:43 +05:30
contact.py	sales communication fix for status	2013-02-11 15:08:24 +05:30
make_web_include_files.py	website settings social icons	2013-02-20 15:02:21 +05:30
product.py	re-adding description as it is distorting list	2013-02-11 20:28:56 +05:30
sitemap.py	update webpage name to be much longer, remove .html from links and refactor newsletter layout	2013-01-01 10:55:58 +05:30
slideshow.py	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30