summaryrefslogtreecommitdiff
path: root/addons/web/static/lib/bootstrap/javascripts
diff options
context:
space:
mode:
authorRichard Mathot (OpenERP) <rim@openerp.com>2013-11-14 08:46:13 +0100
committerRichard Mathot (OpenERP) <rim@openerp.com>2013-11-14 08:46:13 +0100
commitc167764470ea81d14c2ee9b5b3748831a49616f8 (patch)
tree73a4c9bb8a8d08fd946767b1ccd0f1e713bfd210 /addons/web/static/lib/bootstrap/javascripts
parente9a44f52eda37cbb1790f651a23cda657050fa09 (diff)
parent569b6dc22090b22eab6f7b517060e68facf2b255 (diff)
[MERGE] Merge parents
bzr revid: rim@openerp.com-20131114074613-1bqbuwb0b6c3aghq
Diffstat (limited to 'addons/web/static/lib/bootstrap/javascripts')
0 files changed, 0 insertions, 0 deletions