]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11676
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 22:10:48 +0000 (14:10 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 22:10:48 +0000 (14:10 -0800)
commit122245fe87bbd293a82ffa6b9c37d8b174b3dc0f
tree35679d94b5787a2ffaf712caa0fab3bf47dd8fa3
parent0fcaca86b57bf3a4fa2c8f709e90499c92e0db73
parent55f6beb4278979155549e17da6e87a2548ec0b88
Merge branch 'master' into pr/11676

Conflicts:
less/modals.less
less/modals.less