| 
							
							
								 Mark Otto | 5d114f8cb4 | grunt | 2015-08-17 11:18:35 -07:00 |  | 
			
				
					| 
							
							
								 Jacob Thornton | 17ba95c201 | rebuild stuff | 2015-08-12 21:17:43 -07:00 |  | 
			
				
					| 
							
							
								 Mark Otto | b39ce7d6c0 | grunt | 2015-06-18 15:48:54 -07:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 663576a7ae | Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css | 2015-05-27 15:49:55 -07:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 01d1090ed2 | grunt action | 2015-03-09 14:08:20 +00:00 |  | 
			
				
					| 
							
							
								 Mark Otto | c16fee5efd | Merge branch 'master' into v4 Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json | 2015-03-01 13:44:10 -08:00 |  | 
			
				
					| 
							
							
								 XhmikosR | 05b444aee3 | Run grunt. | 2015-02-26 11:30:23 +02:00 |  | 
			
				
					| 
							
							
								 fat | 1e9e3316b6 | kill affix | 2015-02-11 11:40:57 -08:00 |  | 
			
				
					| 
							
							
								 XhmikosR | 8fd5718e71 | Run grunt. | 2015-01-30 15:13:24 +02:00 |  | 
			
				
					| 
							
							
								 Mark Otto | faedb7fec4 | grunt | 2015-01-19 14:55:25 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | c683e7dea7 | bump versions | 2015-01-19 08:32:13 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 22b79dae3c | grunt | 2015-01-18 12:22:43 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | d4f1331e51 | grunt | 2015-01-15 15:51:02 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 615eb99067 | fix broke shit, recompile | 2015-01-03 20:16:46 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | e4fa95eb57 | grunt dist | 2015-01-01 12:02:02 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 94753bc3ec | grunt | 2014-12-18 20:19:53 -08:00 |  | 
			
				
					| 
							
							
								 XhmikosR | 7ea49019b8 | Run grunt. | 2014-11-24 09:53:42 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | c2abfc0a44 | grunt | 2014-11-17 18:57:02 +01:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 9a7e365c2c | bump version to v3.3.1 | 2014-11-12 09:03:16 -08:00 |  | 
			
				
					| 
							
							
								 Mark Otto | ff386147ce | grunt | 2014-11-11 20:25:09 -08:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | e27dc5d71e | grunt | 2014-11-05 01:56:18 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | db90ff6df7 | grunt | 2014-11-05 01:45:16 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 6020bb06f2 | grunt | 2014-11-05 00:36:52 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | b8c3c5c19b | grunt | 2014-10-30 04:45:04 +01:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 94b59b57d6 | version bump | 2014-10-29 08:56:20 -07:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | bf2ad00ee0 | grunt | 2014-10-29 04:56:02 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 94b544c229 | grunt | 2014-10-29 04:44:52 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | a7f58a8356 | grunt | 2014-10-29 04:30:31 +01:00 |  | 
			
				
					| 
							
							
								 Mark Otto | a5497da5be | grunt | 2014-10-27 20:37:17 -07:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 2cbb1d9374 | grunt | 2014-10-26 04:39:49 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 5f2e6fa58b | grunt | 2014-10-26 03:53:10 +01:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 44cc763229 | grunt | 2014-10-26 03:17:19 +01:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 9bf9aab132 | grunt | 2014-10-25 18:29:15 -07:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | e9d6f256c2 | grunt | 2014-10-26 01:59:25 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 51f1f58be8 | grunt | 2014-10-23 06:39:51 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | e0cea19cbc | grunt | 2014-10-23 05:23:29 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 40c309b39a | grunt | 2014-10-22 21:39:37 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 2bc5277b44 | grunt | 2014-10-22 21:04:18 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 930c422f22 | grunt | 2014-10-22 04:28:16 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 4a89fd02b7 | grunt | 2014-10-10 08:35:56 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 5bb08c50fa | grunt | 2014-10-03 08:17:49 +02:00 |  | 
			
				
					| 
							
							
								 Mark Otto | f75fc32462 | grunt | 2014-10-02 22:21:02 -07:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 12091b9567 | Fixes #14711: Account for list groups in collapsing panels | 2014-10-02 21:19:20 -07:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 0d04dcaebd | grunt | 2014-09-26 00:10:41 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 7ce6824748 | grunt | 2014-09-25 02:23:48 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 36ebec5e76 | grunt | 2014-09-22 21:47:24 +02:00 |  | 
			
				
					| 
							
							
								 Mark Otto | 75204aeafa | grunt | 2014-09-18 18:33:52 -07:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 5a5cf224e1 | grunt | 2014-09-16 05:59:09 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | d0f76e416c | grunt | 2014-09-13 04:46:31 +02:00 |  | 
			
				
					| 
							
							
								 Heinrich Fenkart | 0a4c39dc40 | Teh grunt https://www.youtube.com/watch?v=L-4VxEtWyRo | 2014-09-13 03:15:04 +02:00 |  |