Odoo Server (MOVED TO GITHUB)

Merge proposals dependent on lp://staging/~camptocamp/openobject-server/trunk-fix_1314680-afe

  1. trunk-fix_1314680-afe
  2. Dependent merge proposals

lp://staging/~camptocamp/openobject-server/trunk-fix_1314680-afe has no merge proposals.