Richard Mathot (OpenERP) f529de5625 [FIX] Fixing merge problems ... bzr revid: rim@openerp.com-20140120092342-k2dh91lwiktasf2v		2014-01-20 10:23:42 +01:00
..
controllers	[FIX] website_crm: contact-us form	2014-01-07 15:54:00 +01:00
data	[MOV] website_crm: moved data file into data directory (new module organization)	2013-10-14 10:24:01 +02:00
static/description	[IMP] Add icon	2013-10-05 01:28:48 +02:00
views	[FIX] website_crm: contact-us form	2014-01-07 15:54:00 +01:00
__init__.py	[REF] website_google_map, website_crm, website_crm_partner_assign, website_membership: extracted res.partner model stuff into dedicated module and moved model-related stuff inside a models directory.	2013-10-02 11:23:09 +02:00
__openerp__.py	[FIX] Fixing merge problems	2014-01-20 10:23:42 +01:00