]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec52361 0da684f)
Merge branch 'v4-dev' into fix-travis-v4
authorThomas McDonald <thomasm@palantir.com>
Mon, 24 Aug 2015 23:19:19 +0000 (16:19 -0700)
committerThomas McDonald <thomasm@palantir.com>
Mon, 24 Aug 2015 23:19:19 +0000 (16:19 -0700)
1  2 
Gemfile patch | diff1 | diff2 | blob | history

diff --cc Gemfile
Simple merge
Mirror of https://github.com/twbs/bootstrap.git