]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into icon_paths
authorMark Otto <otto@github.com>
Tue, 13 May 2014 03:26:23 +0000 (20:26 -0700)
committerMark Otto <otto@github.com>
Tue, 13 May 2014 03:26:23 +0000 (20:26 -0700)
commitc42cd8164c8698cbc3acfbb99e525bd8f195d819
treecd132146d6f1a81f47d922cc12abd268cb5178f1
parent31956be6ef6d1b1a2537c3441e69120ef3c99a2b
parentd4c72487490169c11e4c0166d31cbb40b105c216
Merge branch 'master' into icon_paths

Conflicts:
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map