diff options
| author | mrmrs <[email protected]> | 2014-03-09 23:28:08 -0700 |
|---|---|---|
| committer | mrmrs <[email protected]> | 2014-03-09 23:28:08 -0700 |
| commit | 2f380a968353e1adc4a331e0c5892a07e1241ae7 (patch) | |
| tree | 7a723d64d73817f53e05bab7f4109edb2161d60f /docs/dist/css/bootstrap-theme.css.map | |
| parent | 348b7de7f7c6c1fb72b0e47124d814c639475f5d (diff) | |
| parent | e727973d8c8cec151f13bd65d24a664918efd28a (diff) | |
| download | bootstrap-2f380a968353e1adc4a331e0c5892a07e1241ae7.tar.xz bootstrap-2f380a968353e1adc4a331e0c5892a07e1241ae7.zip | |
Merge branch 'master' into modular-the-mixins
* master:
Replace some images on the Carousel example with some base64 encoded 1x1 gifs
ugh grunt
moar grunt
mo copy
http://www.youtube.com/watch?v=AJWtLf4-WWs
grunt
Copy change
fix grammar in comment in forms.less
Fixes #12759
Fixes #12738
replace .visible-{size} with .visible-{size}-{display} ; fixes #8869
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/mixins.less
Diffstat (limited to 'docs/dist/css/bootstrap-theme.css.map')
0 files changed, 0 insertions, 0 deletions