lp:~julius-network-solutions/openobject-addons/trunk-bug-wiki-image

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons/6.0

OpenERP Core Team: Pending requested 2011-10-05

Diff: 28 lines (+3/-3)

2 files modified

wiki/web/controllers/wiki.py (+1/-1)
wiki/web/widgets/wiki.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4871. By Mathieu Vatel - Julius Network Solutions on 2011-10-05

[FIX] - Allows to get and display an image from attachments in the wiki content

4870. By Raphael Collet (OpenERP) on 2011-10-05

[MERGE] lp:836526

4869. By Launchpad Translations on behalf of openerp on 2011-10-05

Launchpad automatic translations update.

4868. By nel on 2011-10-04

[MERGE] opw-17918

4867. By nel on 2011-04-04

[IMP] test move lines

4866. By Launchpad Translations on behalf of openerp on 2011-10-04

Launchpad automatic translations update.

4865. By Raphael Collet (OpenERP) on 2011-10-03

[MERGE] opw 17871 (2)

4864. By Raphael Collet (OpenERP) on 2011-10-03

[MERGE] opw 17871 (1)

4863. By Raphael Collet (OpenERP) on 2011-10-03

[MERGE] bug 834091

4862. By Launchpad Translations on behalf of openerp on 2011-10-03

Launchpad automatic translations update.