]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of https://github.com/twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Tue, 23 Dec 2014 03:30:51 +0000 (19:30 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 23 Dec 2014 03:30:51 +0000 (19:30 -0800)
commitb615bd938bccbebb7dc5f89081f4fa024784bf1f
tree1f7b9268215a84df935d1d06c3a2e7e95cc3f96c
parentc41970c5797cd1c3b61a5396031a3258c9c07705
parent3668bde098e1bce289ba313119fe3cf05d01825b
Merge branch 'master' of https://github.com/twbs/bootstrap

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.css.map
less/forms.less