summaryrefslogtreecommitdiff
path: root/addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss
diff options
context:
space:
mode:
authorBharat R. Devnani (OpenERP) <bde@tinyerp.com>2014-03-04 11:08:49 +0530
committerBharat R. Devnani (OpenERP) <bde@tinyerp.com>2014-03-04 11:08:49 +0530
commit67b68d8e4e7015e368324dd0c02aa29fed71d359 (patch)
treed72e75ef050bd65dcb53d2a27305a0285ca2963b /addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss
parent7c1af9ef1441b2097c815758670b70a690598d62 (diff)
parente76c36d704c142fca08bf1297897d4091bf7a4cb (diff)
[MERGE] merged with main web
bzr revid: bde@tinyerp.com-20140304053849-wpvxs1ojl5jyjokt
Diffstat (limited to 'addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss')
-rw-r--r--addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss b/addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss
new file mode 100644
index 00000000000..457a7ab3685
--- /dev/null
+++ b/addons/web/static/lib/bootstrap/stylesheets/bootstrap.scss
@@ -0,0 +1 @@
+@import "bootstrap/bootstrap"; \ No newline at end of file