]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commit54670ab64a2565fd35071eb17fc7eef3480eb724
treee92b56ba1a2a748d4b27e519fc61b6894e9791ab
parent7cd35f0cb6d17d6117264f71f175a9e5b0b09580
parentcfab4b1e9e3777bb146a8ef13c1df3ea5dcb5d31
Merge branch 'bs-ex' into bs3_restore_examples

Conflicts:
.editorconfig
.gitignore