]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cd35f0 cfab4b1)
Merge branch 'bs-ex' into bs3_restore_examples
authorMark Otto <otto@github.com>
Thu, 15 Aug 2013 23:38:12 +0000 (16:38 -0700)
committerMark Otto <otto@github.com>
Thu, 15 Aug 2013 23:38:12 +0000 (16:38 -0700)
Conflicts:
.editorconfig
.gitignore


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