github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.3.1-j6

Browse Source 
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j5-wip

Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
This commit is contained in:
Arnold Daniels
2013-03-11 01:54:03 +01:00
parent 2f3c08f2c5 eb24718add
commit 7337f2961a
40 changed files with 136 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.3.0
* Bootstrap v2.3.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0