]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
authorMark Otto <markdotto@gmail.com>
Wed, 31 Dec 2014 18:39:56 +0000 (10:39 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 31 Dec 2014 18:39:56 +0000 (10:39 -0800)
1  2 
dist/css/bootstrap.css
docs/assets/js/src/application.js
scss/_forms.scss

Simple merge
Simple merge
Simple merge