• mrmrs's avatar
    Merge branch 'master' into modular-the-mixins · 2f380a96
    mrmrs authored
    * 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
    2f380a96
Name
Last commit
Last update
..
bootstrap-rtl.min.css Loading commit data...
bootstrap-theme.css.map Loading commit data...
bootstrap-theme.min.css Loading commit data...
bootstrap.css.map Loading commit data...
bootstrap.min.css Loading commit data...