summaryrefslogtreecommitdiff
path: root/addons/website/static/lib/ckeditor/plugins/image2/plugin.js
diff options
context:
space:
mode:
authorParamjit Singh Sahota <psa@tinyerp.com>2013-11-11 12:01:23 +0530
committerParamjit Singh Sahota <psa@tinyerp.com>2013-11-11 12:01:23 +0530
commitbe9553d6f143638bcfa827c6d15677180ed04681 (patch)
tree1ff5bf5b7aa01cca9b2adf35b39a5643e48287b2 /addons/website/static/lib/ckeditor/plugins/image2/plugin.js
parent6184c540dec1fc03b3c49660e7acded894b7d93a (diff)
parent221c6b7dbd2ee6bfd334419ea3945f177103cd58 (diff)
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131111063123-qysh7oyiscfy8ku9
Diffstat (limited to 'addons/website/static/lib/ckeditor/plugins/image2/plugin.js')
0 files changed, 0 insertions, 0 deletions