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
..
about_us_settings	updated language	2013-02-11 11:44:12 +05:30
about_us_team_member	updated language	2013-02-11 11:44:12 +05:30
blog	updated language	2013-02-11 11:44:12 +05:30
blog_subscriber/locale	updated language	2013-02-11 11:44:12 +05:30
company_history	updated language	2013-02-11 11:44:12 +05:30
contact_us_settings	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30
cross_list_item_group/locale	updated language	2013-02-11 11:44:12 +05:30
product_group/locale	updated language	2013-02-11 11:44:12 +05:30
product_settings	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30
products_settings/locale	updated language	2013-02-11 11:44:12 +05:30
related_page	updated language	2013-02-11 11:44:12 +05:30
style_settings	updated language	2013-02-11 11:44:12 +05:30
top_bar_item	updated language	2013-02-11 11:44:12 +05:30
web_page	show page name in web page list view	2013-02-12 13:04:25 +05:30
website_item_group	updated language	2013-02-11 11:44:12 +05:30
website_product_category	updated language	2013-02-11 11:44:12 +05:30
website_script	updated language	2013-02-11 11:44:12 +05:30
website_settings	updates to website footer	2013-02-21 10:49:37 +05:30
website_slideshow	updated language	2013-02-11 11:44:12 +05:30
website_slideshow_item	updated language	2013-02-11 11:44:12 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30