Bárbara Perretti 4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n ... Conflicts: accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js public/js/complete_setup.js selling/doctype/opportunity/opportunity.js selling/doctype/quotation/quotation.js		2013-10-16 15:09:18 -03:00
..
activity_type	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
project	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
project_milestone	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
task	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
time_log	Fix translate time_log_calendar.js	2013-10-08 15:19:18 -03:00
time_log_batch	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
time_log_batch_detail	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30