1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-25 12:22:50 +01:00
mrmrs 2f380a9683 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
2014-03-09 23:28:08 -07:00
..
2014-03-07 18:54:53 +01:00
2014-03-06 23:51:07 -08:00
2014-02-08 16:56:59 -08:00
2014-03-07 18:54:53 +01:00
2014-03-09 20:45:32 -07:00
2014-03-06 21:05:29 -08:00
2014-03-07 09:01:54 +01:00
2014-03-07 00:59:22 -08:00
2014-03-09 20:45:32 -07:00