]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorfat <jacobthornton@gmail.com>
Tue, 24 Dec 2013 20:35:24 +0000 (12:35 -0800)
committerfat <jacobthornton@gmail.com>
Tue, 24 Dec 2013 20:35:24 +0000 (12:35 -0800)
commit558b6a478d6dfdc5a8ee579c93d1080b553ac9a0
tree4739563ddfbd59ed5fc49dd9bdd736cf1fbe93e7
parent50bd4edb8c2f498ac10a07250c57570489c427b0
parent1da3a8c6b131102f7e04a08f15783ca596634694
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
js/affix.js