summaryrefslogtreecommitdiff
path: root/addons/base_import/static/lib/select2/select2.js
diff options
context:
space:
mode:
authorAmit Bhavsar (Open ERP) <amb@tinyerp.com>2013-05-28 14:49:41 +0530
committerAmit Bhavsar (Open ERP) <amb@tinyerp.com>2013-05-28 14:49:41 +0530
commit24848a8dccf0b8acc77b2e9fd007f613bbf1736b (patch)
tree343ca29c494e3310c1d6fa4b4f2e97a396e21c8e /addons/base_import/static/lib/select2/select2.js
parent1b08798b52df8f0a3a72d116577cd7451b45b30c (diff)
parent814a121dabbbe45a1c9ee671222b3a2bf261059a (diff)
[MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
Diffstat (limited to 'addons/base_import/static/lib/select2/select2.js')
-rw-r--r--[-rwxr-xr-x]addons/base_import/static/lib/select2/select2.js0
1 files changed, 0 insertions, 0 deletions
diff --git a/addons/base_import/static/lib/select2/select2.js b/addons/base_import/static/lib/select2/select2.js
index 42ce0a928b8..42ce0a928b8 100755..100644
--- a/addons/base_import/static/lib/select2/select2.js
+++ b/addons/base_import/static/lib/select2/select2.js