]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 04:19:43 +0000 (21:19 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 04:19:43 +0000 (21:19 -0700)
commitf579b66b80724fc560cce8d8b0294c6f998be364
tree4a24f58e8f83ebd67151b52c6336b23f43b4ef72
parent12091b9567e77f8b503d31860b3115791b072a3b
parent68b80836cfdf6b942053470291c31f27c9c1b335
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs/assets/js/raw-files.min.js