]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Wed, 15 Jan 2014 05:45:10 +0000 (21:45 -0800)
committerMark Otto <otto@github.com>
Wed, 15 Jan 2014 05:45:10 +0000 (21:45 -0800)
commitb93ce03f19079aaf977125ba27318df0107057eb
treed9aaaee15e4d9ae2dd990de756d757acf38f37e3
parent413c8a6da533c59bb9a923901b5358ddb61564a5
parent5ead87d519682c68b18bf796273da70a32b68a96
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs/assets/js/customize.min.js