Thibault Delavallée bcbae5e277 [MERGE] Merged with addons/trunk, with lots of conflicts to solve... ...

bzr revid: tde@openerp.com-20120920074850-7p7or1ze8555fya5

2012-09-20 09:48:50 +02:00

..

security

[IMP] Merging notes from chm

2012-09-19 08:42:35 +02:00

static/src

[IMP] note : tags on kanban

2012-09-11 11:49:48 +02:00

__init__.py

…

__openerp__.py

[IMP] contacts: new module

2012-09-19 13:51:30 +02:00

note_data.xml

[MERGE] merging notes + small cleaning

2012-09-16 19:10:15 +02:00

note_demo.xml

[IMG] base_calendar, note_pad

2012-09-19 16:35:53 +02:00

note_view.xml

[MERGE] Merged with addons/trunk, with lots of conflicts to solve...

2012-09-20 09:48:50 +02:00

note.py

[IMG] base_calendar, note_pad

2012-09-19 16:35:53 +02:00