• 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
dist Loading commit data...
docs Loading commit data...
fonts Loading commit data...
grunt Loading commit data...
js Loading commit data...
less Loading commit data...
test-infra Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.travis.yml Loading commit data...
CNAME Loading commit data...
CONTRIBUTING.md Loading commit data...
Gruntfile.js Loading commit data...
LICENSE Loading commit data...
README.md Loading commit data...
_config.yml Loading commit data...
bower.json Loading commit data...
composer.json Loading commit data...
package.json Loading commit data...