Christophe Simonis a61e7cb0c8 [MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf ...

bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b

2013-06-13 19:39:00 +02:00

..

cli

[FIX] test_js typo

2012-12-09 05:30:15 +01:00

controllers

[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

2013-06-13 19:39:00 +02:00

doc

[MERGE] forward port of branch 7.0 up to revid 3973 chs@openerp.com-20130611145028-f98x6inytlr3ijjg

2013-06-11 17:52:51 +02:00

i18n

Launchpad automatic translations update.

2013-06-13 05:35:05 +00:00

static

[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

2013-06-13 19:39:00 +02:00

tests

Put back stuff removed by merge

2013-06-07 12:37:49 +02:00

__init__.py

minor fixes

2012-12-19 03:49:46 +01:00

__openerp__.py

[MERGE] merge with latest trunk

2013-05-28 14:28:53 +05:30

http.py

[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

2013-06-13 19:39:00 +02:00

session.py

[MERGE] forward port of branch 7.0 up to revid 3973 chs@openerp.com-20130611145028-f98x6inytlr3ijjg

2013-06-11 17:52:51 +02:00