1. 18 Sep, 2014 7 commits
  2. 17 Sep, 2014 2 commits
    • Mark Otto's avatar
      Merge branch 'master' into derp · 9f2aeafe
      Mark Otto authored
      Conflicts:
      	Gruntfile.js
      	dist/css/bootstrap-theme.css.map
      	dist/css/bootstrap.css
      	dist/css/bootstrap.css.map
      	dist/css/bootstrap.min.css
      	dist/fonts/glyphicons-halflings-regular.svg
      	docs/_includes/components/badges.html
      	docs/_includes/components/input-groups.html
      	docs/_includes/components/pagination.html
      	docs/_includes/css/forms.html
      	docs/_includes/footer.html
      	docs/_includes/getting-started/browser-device-support.html
      	docs/_includes/getting-started/grunt.html
      	docs/_includes/home-nav.html
      	docs/_includes/js/alerts.html
      	docs/_includes/js/buttons.html
      	docs/_includes/js/carousel.html
      	docs/_includes/js/collapse.html
      	docs/_includes/js/modal.html
      	docs/_includes/js/popovers.html
      	docs/_includes/js/tooltips.html
      	docs/_includes/nav/getting-started.html
      	docs/_includes/nav/javascript.html
      	docs/assets/css/docs.min.css
      	docs/assets/css/src/docs.css
      	docs/assets/js/customize.min.js
      	docs/assets/js/raw-files.min.js
      	docs/browser-bugs.html
      	docs/dist/css/bootstrap-theme.css.map
      	docs/dist/css/bootstrap.css
      	docs/dist/css/bootstrap.css.map
      	docs/dist/css/bootstrap.min.css
      	docs/dist/fonts/glyphicons-halflings-regular.svg
      	fonts/glyphicons-halflings-regular.svg
      	less/_button-group.less
      	less/_jumbotron.less
      	less/_variables.less
      	less/mixins/vendor-prefixes.less
      	less/panels.less
      	less/thumbnails.less
      	package.json
      9f2aeafe
    • Mark Otto's avatar
  3. 16 Sep, 2014 6 commits
  4. 15 Sep, 2014 3 commits
  5. 13 Sep, 2014 15 commits
  6. 11 Sep, 2014 2 commits
  7. 09 Sep, 2014 4 commits
  8. 08 Sep, 2014 1 commit