Christophe Simonis 67366dfb5e [MERGE] merge upstream branch. ...

Forward ports generates a lot of conflicts to resolve. Rebasing
(even with rerere) will force me to re-resolve most of the conflicts.

2015-07-22 16:29:42 +02:00

..

i18n

[I18N] Update translation terms from Transifex

2015-07-05 01:52:32 +02:00

models

[MERGE] forward port of branch saas-6 up to 63e92cb

2015-07-22 16:17:54 +02:00

security

[IMP] payment: add support for server2server payments

2015-06-15 14:57:14 +02:00

static/description

…

tests

…

views

[MERGE] merge upstream branch.

2015-07-22 16:29:42 +02:00

__init__.py

[LEGAL] Use global LICENSE/COPYRIGHT files, remove boilerplate text

2015-06-02 03:16:04 +02:00

__openerp__.py

[IMP] payment: add support for server2server payments

2015-06-15 14:57:14 +02:00