]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Mon, 13 Jan 2014 00:10:57 +0000 (16:10 -0800)
committerMark Otto <otto@github.com>
Mon, 13 Jan 2014 00:10:57 +0000 (16:10 -0800)
commitb17dca240e1e405088e0ebe316a3b3ebd3054e5b
tree9c2886746939941c523e9d832cbb14f150725fff
parent4b1ff7fa49361fd4a13341767d53231fc9ecef21
parent80bed836e0a699d43c483e9957d153edff1ce3d1
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/js/docs.min.js
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js