]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan...
authorMark Otto <otto@github.com>
Mon, 21 Oct 2013 02:55:56 +0000 (19:55 -0700)
committerMark Otto <otto@github.com>
Mon, 21 Oct 2013 02:55:56 +0000 (19:55 -0700)
commit369f5ba760993001fe6c4cc56ee3cf0327c3395d
treec462c6071aa0601fa505df6ab82292991103f19b
parentdd34102cb6bb601c3103f2c74804d2382271c0e1
parent976f6dfdad663e43237a3da07cb64a41932f264e
Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css