]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'pr/11779' into drop_recess_for_less
authorMark Otto <otto@github.com>
Mon, 9 Dec 2013 07:56:22 +0000 (23:56 -0800)
committerMark Otto <otto@github.com>
Mon, 9 Dec 2013 07:56:22 +0000 (23:56 -0800)
commitde218bbba83b83f96f62b689a56b18b3ebcd191e
tree5eb4c58adec10c3bb98cc6d306e80887b7f2e6d3
parentea61a19a04e3bcd96f1dc0960375d926bb1dabb5
parentcbfbf1b2dd16b1aa17e3feef9a4643e98a0f967e
Merge branch 'pr/11779' into drop_recess_for_less

Conflicts:
Gruntfile.js
package.json
Gruntfile.js
package.json