Holger Brunn a23dbca2e1 Merge remote-tracking branch 'upstream/6.1' into 6.1_fix_e265 ... Conflicts: web_ckeditor4/__openerp__.py		2014-07-21 09:31:00 +02:00
..
static	[ADD] icons source	2013-10-17 12:44:58 +02:00
__init__.py	[FIX] pass flake8	2014-07-07 14:25:58 +02:00
__openerp__.py	[IMP] fix e265	2014-07-17 21:27:41 +02:00