]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c42cd81 3dd1531)
Merge branch 'master' into icon_paths
authorMark Otto <otto@github.com>
Wed, 21 May 2014 06:21:12 +0000 (23:21 -0700)
committerMark Otto <otto@github.com>
Wed, 21 May 2014 06:21:12 +0000 (23:21 -0700)

Trivial merge
Mirror of https://github.com/twbs/bootstrap.git