]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into icon_paths
authorMark Otto <otto@github.com>
Fri, 23 May 2014 06:01:42 +0000 (23:01 -0700)
committerMark Otto <otto@github.com>
Fri, 23 May 2014 06:01:42 +0000 (23:01 -0700)
commitd66b65ddde1b2f1a5cb14f601d30c552c79d7626
treed7f07c493e959cebd256939bf28bcbf4af468a28
parent91d51d3fba1cc2f80138bb2858ce67c28c9c8a89
parent10e9fef85c6afde2b3804df928d9351b0f110a6c
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