diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/website/static/src/less/import_bootstrap.less | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/website/static/src/less/import_bootstrap.less')
| -rw-r--r-- | addons/website/static/src/less/import_bootstrap.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/website/static/src/less/import_bootstrap.less b/addons/website/static/src/less/import_bootstrap.less new file mode 100644 index 00000000000..cbd46a7afcf --- /dev/null +++ b/addons/website/static/src/less/import_bootstrap.less @@ -0,0 +1 @@ +@import "bootstrap"; |