]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Tue, 14 Jan 2014 06:43:18 +0000 (22:43 -0800)
committerMark Otto <otto@github.com>
Tue, 14 Jan 2014 06:43:18 +0000 (22:43 -0800)
commiteca81939ccb989d6677ed5660d1db812cfabbff8
tree51bf781bd68b7a064baf02b0c19f0c3f4c544cd6
parentb17dca240e1e405088e0ebe316a3b3ebd3054e5b
parent8c0cb806c6471749761efb4f9c892344d357e769
Merge branch 'master' into docs_derp

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