Johann-S 
							
						 
					 
					
						
						
						
						
							
						
						
							cc303d5d26 
							
						 
					 
					
						
						
							
							Update Popper.js to 1.9.9  
						
						 
						
						
						
						
					 
					
						2017-05-24 14:57:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johann-S 
							
						 
					 
					
						
						
						
						
							
						
						
							dd78950d0a 
							
						 
					 
					
						
						
							
							Update Popper.js 1.9.4  
						
						 
						
						
						
						
					 
					
						2017-05-17 14:22:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johann-S 
							
						 
					 
					
						
						
						
						
							
						
						
							21c3864134 
							
						 
					 
					
						
						
							
							Update Popper.js 1.9.3  
						
						 
						
						
						
						
					 
					
						2017-05-14 11:41:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johann-S 
							
						 
					 
					
						
						
						
						
							
						
						
							3cfa5e8c05 
							
						 
					 
					
						
						
							
							Update Popper.js 1.9.1 + Update documentation about Dropdown placement  
						
						 
						
						
						
						
					 
					
						2017-05-14 11:41:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johann-S 
							
						 
					 
					
						
						
						
						
							
						
						
							458b3cc4a3 
							
						 
					 
					
						
						
							
							Update Popper.js 1.8.2  
						
						 
						
						
						
						
					 
					
						2017-05-14 11:41:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Johann-S 
							
						 
					 
					
						
						
						
						
							
						
						
							d5fabf8de5 
							
						 
					 
					
						
						
							
							Remove totaly Tether from documentation + dependencies  
						
						 
						
						
						
						
					 
					
						2017-05-14 11:41:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick H. Lauke 
							
						 
					 
					
						
						
						
						
							
						
						
							63cd4e96b3 
							
						 
					 
					
						
						
							
							Add explicit aria-label to placeholder-only inputs  
						
						 
						
						... 
						
						
						
						While `placeholder` is nominally valid per spec
http://rawgit.com/w3c/html-api-map/master/index.html#accessible-name-and-description-calculation 
it is inelegant, a fallback, and not supported in ios/safari/voiceover
and android/chrome/talkback, to name a few combinations
`aria-describedby` is also not really the right tool for providing a
name/label equivalent, so remove that from the list of possible
alternative methods / clarify how it can be used 
						
						
					 
					
						2017-03-30 23:31:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							90c5f6230b 
							
						 
					 
					
						
						
							
							rename from .navbar-toggleable to .navbar-expand to reflect mobile first approach everywhere else  
						
						 
						
						
						
						
					 
					
						2017-03-23 23:02:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							11ba308b2f 
							
						 
					 
					
						
						
							
							more docs updates  
						
						 
						
						
						
						
					 
					
						2017-03-23 23:02:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							1ecb74e007 
							
						 
					 
					
						
						
							
							bump to jquery 3.2.1  
						
						 
						
						
						
						
					 
					
						2017-03-20 23:27:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bardi Harborow 
							
						 
					 
					
						
						
						
						
							
						
						
							09fb2b9af3 
							
						 
					 
					
						
						
							
							Update dependencies.  
						
						 
						
						
						
						
					 
					
						2017-03-20 17:37:05 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bardi Harborow 
							
						 
					 
					
						
						
						
						
							
						
						
							0ac7eb4fe0 
							
						 
					 
					
						
						
							
							Update dependencies.  
						
						 
						
						
						
						
					 
					
						2017-01-05 14:39:18 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							4dc6f44796 
							
						 
					 
					
						
						
							
							update docs and examples to use new utils  
						
						 
						
						
						
						
					 
					
						2017-01-02 11:48:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							e2b6badb86 
							
						 
					 
					
						
						
							
							v4: Rip out IE compatibility mode meta tags ( #21483 )  
						
						 
						
						... 
						
						
						
						* Remove IE compatibility mode meta tag from docs, examples, and JS tests as we no longer support IE9 and IE8
* update and remove some IE bits from our supported browser page
* update introduction.md to match
* reword starter template intro 
						
						
					 
					
						2016-12-31 12:20:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6c473696 
							
						 
					 
					
						
						
							
							switch to jquery slim, update examples to use code.jquery.com cdn  
						
						 
						
						
						
						
					 
					
						2016-12-31 00:52:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							0e84876379 
							
						 
					 
					
						
						
							
							update all examples  
						
						 
						
						
						
						
					 
					
						2016-12-28 19:07:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							f721ebf3b4 
							
						 
					 
					
						
						
							
							unify alignment of all these dang navbar forms  
						
						 
						
						
						
						
					 
					
						2016-12-24 14:21:04 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							bb97ae18f7 
							
						 
					 
					
						
						
							
							streamline example navbars by removing .hidden-* classes on togglers  
						
						 
						
						
						
						
					 
					
						2016-12-22 13:48:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							df566160e7 
							
						 
					 
					
						
						
							
							put new toggler markup to use  
						
						 
						
						
						
						
					 
					
						2016-12-22 13:48:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							80674b0c58 
							
						 
					 
					
						
						
							
							fixes   #18115 : move forward with one naming scheme for inversed color schemes, renaming .navbar-dark to .navbar-inverse (matching .card-inverse in the process and restoring v3's inverted class name)  
						
						 
						
						
						
						
					 
					
						2016-12-22 13:48:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							cfdc66a342 
							
						 
					 
					
						
						
							
							fix sticky footer example navbar  
						
						 
						
						
						
						
					 
					
						2016-12-22 13:48:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Starsam80 
							
						 
					 
					
						
						
						
						
							
						
						
							54908a95a8 
							
						 
					 
					
						
						
							
							Rename .navbar-toggleable-xs to .navbar-toggleable + more cleanup ( #21226 )  
						
						 
						
						... 
						
						
						
						* Clean up some utilities
- Align CSS properties
- In `_spacing.scss`, we had a comment saying what 'a' was for, but we removed that so this comment no longer applies
* Remove '-xs' from `.navbar-toggleable-xs` and remove duplication
* Fix outdated classes to use newer ones 
						
						
					 
					
						2016-11-27 22:23:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vsn4ik 
							
						 
					 
					
						
						
						
						
							
						
						
							85327e4f9a 
							
						 
					 
					
						
						
							
							v4: Fix outdated utilites classes  
						
						 
						
						
						
						
					 
					
						2016-10-12 01:46:10 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick H. Lauke 
							
						 
					 
					
						
						
						
						
							
						
						
							a426c4951c 
							
						 
					 
					
						
						
							
							remove navbar-toggler unicode symbol in HTML  
						
						 
						
						... 
						
						
						
						remove current HTML-based symbol, add any missing aria-* attributes 
						
						
					 
					
						2016-07-19 22:11:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Lutzenberger 
							
						 
					 
					
						
						
						
						
							
						
						
							3487e421b5 
							
						 
					 
					
						
						
							
							Fix HTML validity error in sticky-footer-navbar example ( #20295 )  
						
						 
						
						
						
						
					 
					
						2016-07-13 10:00:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							ed3ba47425 
							
						 
					 
					
						
						
							
							Support jQuery v3 in Bootstrap v4 ( #20191 )  
						
						 
						
						... 
						
						
						
						* bower.json, package.json: Extend jQuery version ranges to include v3
* NuGet: Bump jQuery to v3.0.0.1
* Docs+Examples: Update jQuery to v3.0.0
* Use jQuery v3.0.0 for JS unit tests
* Update jqueryVersionCheck to allow jQuery v3.x.x 
						
						
					 
					
						2016-06-28 22:19:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							a950d5642b 
							
						 
					 
					
						
						
							
							Update jQuery to v2.2.4.  
						
						 
						
						
						
						
					 
					
						2016-05-26 15:26:12 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							8a878c1f7b 
							
						 
					 
					
						
						
							
							Update jQuery to v2.2.2.  
						
						 
						
						
						
						
					 
					
						2016-03-19 15:21:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							81f2dfbe40 
							
						 
					 
					
						
						
							
							Examples: Update tether to v1.2.0.  
						
						 
						
						... 
						
						
						
						[ci skip] 
						
						
					 
					
						2016-03-07 20:11:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							74808de4d4 
							
						 
					 
					
						
						
							
							Example pages: Remove usages of defunct .page-header class  
						
						 
						
						... 
						
						
						
						/fyi @mdo
Note: The selector in dashboard.css that used .page-header was superfluous
    because the margin that it zeroed was already zero even without that declaration.
[skip sauce] 
						
						
					 
					
						2016-02-27 18:16:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							9304f23ad8 
							
						 
					 
					
						
						
							
							docs: Add SRI hash for Tether; refs  #18665  
						
						 
						
						
						
						
					 
					
						2016-01-10 23:54:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							19d6301506 
							
						 
					 
					
						
						
							
							docs: Add SRI hash for jQuery; refs  #18665  
						
						 
						
						
						
						
					 
					
						2016-01-10 23:54:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							95d030c226 
							
						 
					 
					
						
						
							
							Add Tether to example pages that were missing it  
						
						 
						
						... 
						
						
						
						[skip sauce] 
						
						
					 
					
						2015-12-24 18:13:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							85032786c3 
							
						 
					 
					
						
						
							
							Update examples to account for  #18185  
						
						 
						
						... 
						
						
						
						[skip sauce] 
						
						
					 
					
						2015-12-08 03:41:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							3d45bd6106 
							
						 
					 
					
						
						
							
							fixes   #18293 : clean up sticky stuff  
						
						 
						
						
						
						
					 
					
						2015-12-07 22:05:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							a50849f61b 
							
						 
					 
					
						
						
							
							Switch to jQuery 2.1.4.  
						
						 
						
						... 
						
						
						
						Now that we don't support IE 8 it's safe to do that. 
						
						
					 
					
						2015-10-24 19:09:33 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick H. Lauke 
							
						 
					 
					
						
						
						
						
							
						
						
							872eadeb99 
							
						 
					 
					
						
						
							
							Add shrink-to-fit viewport directive  
						
						 
						
						... 
						
						
						
						Fixes potential problems with iOS9's new viewport behavior - see for
instance https://forums.developer.apple.com/thread/13510  
						
						
					 
					
						2015-10-06 12:35:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							87a3fdd1b7 
							
						 
					 
					
						
						
							
							Clean up inclusion of IE-specific JS files.  
						
						 
						
						... 
						
						
						
						Move them to footer, and remove duplicate ones.
[ci skip] 
						
						
					 
					
						2015-09-06 13:33:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gupocca 
							
						 
					 
					
						
						
						
						
							
						
						
							34932d71b4 
							
						 
					 
					
						
						
							
							Fix several erroneous links in docs.  
						
						 
						
						... 
						
						
						
						Related to #17314 . 
						
						
					 
					
						2015-08-29 10:59:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Heinrich Fenkart 
							
						 
					 
					
						
						
						
						
							
						
						
							73a88dbe86 
							
						 
					 
					
						
						
							
							Docs: Update all dropdowns to new HTML structure  
						
						 
						
						
						
						
					 
					
						2015-08-21 00:18:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							1ddc3f5e21 
							
						 
					 
					
						
						
							
							Merge branch 'master' into v4m  
						
						 
						
						
						
						
					 
					
						2015-08-04 22:29:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							abdf41f5f3 
							
						 
					 
					
						
						
							
							Add a local jQuery fallback.  
						
						 
						
						... 
						
						
						
						Shouldn't really happen, but China for example has blocked Google so this should help. 
						
						
					 
					
						2015-07-26 10:07:33 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							169d2a4a78 
							
						 
					 
					
						
						
							
							Merge branch 'master' into v4  
						
						 
						
						
						
						
					 
					
						2015-06-18 23:56:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick H. Lauke 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd7bc1554 
							
						 
					 
					
						
						
							
							generalize dropdowns / drop role="menu"  
						
						 
						
						... 
						
						
						
						as role="menu" is a very specific (and strict) ARIA pattern for
desktop-like application menus, and our dropdowns are often used
as pure navigation dropdowns, this change abandons ARIA menus for
a more open-ended and light-weight approach
(see http://heydonworks.com/practical_aria_examples/#submenus  and
http://www.w3.org/WAI/tutorials/menus/flyout/#improve-screen-reader-support-using-wai-aria )
note that in dropdown.js, switched to now target ``.dropdown-menu``
instead of ``role["menu"]`` - this also prevents bootstrap scripts
from "bleeding" into non-bootstrap components on the same page.
also removed the ``role=["listbox"]`` part, which appears to be
vestigial/unused (only place in bootstrap that uses that
role are carousels, and their key handling is done separately) 
						
						
					 
					
						2015-06-02 11:03:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Patrick H. Lauke 
							
						 
					 
					
						
						
						
						
							
						
						
							3b59b97c62 
							
						 
					 
					
						
						
							
							ensure divider list items have role="separator"  
						
						 
						
						... 
						
						
						
						http://www.w3.org/TR/wai-aria/roles#separator  
						
						
					 
					
						2015-05-29 23:48:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							1eba173c9e 
							
						 
					 
					
						
						
							
							Update jQuery to v1.11.3.  
						
						 
						
						
						
						
					 
					
						2015-05-10 01:22:23 +03: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Kirsche 
							
						 
					 
					
						
						
						
						
							
						
						
							a380e30f7e 
							
						 
					 
					
						
						
							
							Fix issue  #15601  — Position of X-UA-Compatible  
						
						 
						
						... 
						
						
						
						Fix issue #15601  — Position of X-UA-Compatible, charset and viewport
Add comment to all examples
The non-responsive is correctly saying 2 instead of 3 
						
						
					 
					
						2015-02-02 15:45:57 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							325748ff68 
							
						 
					 
					
						
						
							
							Merge branch 'master' into v4  
						
						 
						
						... 
						
						
						
						Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss 
						
						
					 
					
						2015-01-19 14:48:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							9db1de2a3a 
							
						 
					 
					
						
						
							
							Update jQuery to v1.11.2.  
						
						 
						
						
						
						
					 
					
						2015-01-07 00:31:18 +02:00