2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into docs_derp

Conflicts:
	docs/components.html
	docs/css.html
This commit is contained in:
Mark Otto
2014-01-15 13:08:35 -08:00
17 changed files with 100 additions and 37 deletions
+1 -2
View File
@@ -1,5 +1,4 @@
/*!
* Blob.js
/* Blob.js
* A Blob implementation.
* 2013-12-27
*
+7 -21
View File
File diff suppressed because one or more lines are too long
+1 -2
View File
@@ -1,5 +1,4 @@
/*!
* FileSaver.js
/* FileSaver.js
* A saveAs() FileSaver implementation.
* 2013-12-27
*