summaryrefslogtreecommitdiff
path: root/addons/web_linkedin/web_linkedin.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-12-18 10:32:41 +0100
committerThibault Delavallée <tde@openerp.com>2012-12-18 10:32:41 +0100
commit2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch)
treee7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/web_linkedin/web_linkedin.py
parent6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff)
parent73980eba5f64c674b0bc366c714a9a38d3bb915a (diff)
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/web_linkedin/web_linkedin.py')
-rw-r--r--addons/web_linkedin/web_linkedin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 71865c7fcc1..dc429cd2f29 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -23,7 +23,7 @@ import base64
import urllib2
import openerp
-from osv import osv, fields
+from openerp.osv import fields, osv
class Binary(openerp.addons.web.http.Controller):
_cp_path = "/web_linkedin/binary"