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 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
This commit is contained in:
fat
2013-12-24 12:35:24 -08:00
parent 50bd4edb8c 1da3a8c6b1
commit 558b6a478d
49 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/affix.js
+1 -1
View File
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.1.0
* Bootstrap: affix.js v3.0.3
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2013 Twitter, Inc.