mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

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

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-09-19 22:57:11 -05:00
parent ef636bd62d 22d308b2c1
commit e148923f27
14 changed files with 79 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/jszip.js
+2 -2
View File
@@ -659,7 +659,7 @@ JSZip.prototype = (function () {
if ( !this.files.hasOwnProperty(name) ) { continue; }
var file = this.files[name];
var compressionName = file.compression || options.compression.toUpperCase();
var compressionName = file.options.compression || options.compression.toUpperCase();
var compression = JSZip.compressions[compressionName];
if (!compression) {
throw new Error(compressionName + " is not a valid compression method !");
@@ -1422,4 +1422,4 @@ JSZip.base64 = (function() {
}());
// enforcing Stuk's coding style
// vim: set shiftwidth=3 softtabstop=3:
// vim: set shiftwidth=3 softtabstop=3: