mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Mark Otto
2014-01-11 14:48:04 -08:00
parent 7a2c352b50 d06d61dc12
commit e68d3b961e
9 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery') }
/* ========================================================================
* Bootstrap: transition.js v3.0.3
dist/js/bootstrap.min.js
Vendored
-1
View File
File diff suppressed because one or more lines are too long