2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	docs/assets/js/customize.min.js
This commit is contained in:
Mark Otto
2014-01-14 21:45:10 -08:00
8 changed files with 64 additions and 26 deletions
+1 -2
View File
@@ -1,5 +1,4 @@
/*!
* Blob.js
/* Blob.js
* A Blob implementation.
* 2013-12-27
*
+2 -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
*