]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Fri, 23 Aug 2013 17:47:36 +0000 (10:47 -0700)
committerMark Otto <otto@github.com>
Fri, 23 Aug 2013 17:47:36 +0000 (10:47 -0700)
commitf8de960c388c8235a32e05808e9d0a351d3492bf
tree490f6a3cb67e9885e6072fd84345cb4659a2752e
parenta0d0864bd709878c721093ea6ab779f33b676917
parent4912f960f47c8b0008ca6bcfecb629d4a3ee148a
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
css.html
css.html