diff options
| author | Mark Otto <[email protected]> | 2011-09-02 22:09:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 22:09:49 -0700 |
| commit | 6d118411e1d456553baf5d09aea15ff13f7b8ef4 (patch) | |
| tree | ef84a750770f0b2efee65e204c3085e94cf8f120 /lib/preboot.less | |
| parent | 162534139170e3416cb33a5b5c5093d4a2a5e8f0 (diff) | |
| parent | 3c9c85b1ed85ae633d4b94f421020b84d24d9a5c (diff) | |
| download | bootstrap-6d118411e1d456553baf5d09aea15ff13f7b8ef4.tar.xz bootstrap-6d118411e1d456553baf5d09aea15ff13f7b8ef4.zip | |
resolve conflict
Diffstat (limited to 'lib/preboot.less')
| -rw-r--r-- | lib/preboot.less | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index 3cf924192..3f44e376b 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -152,6 +152,8 @@ .transition(@transition) { -webkit-transition: @transition; -moz-transition: @transition; + -ms-transition: @transition; + -o-transition: @transition; transition: @transition; } |