]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into deprecate-screen-device-vars 10005/head
authorMark Otto <otto@github.com>
Sat, 24 Aug 2013 05:56:23 +0000 (22:56 -0700)
committerMark Otto <otto@github.com>
Sat, 24 Aug 2013 05:56:23 +0000 (22:56 -0700)
commitb86cd3bc3d866838127e7af15f665c70e7f50847
tree0044cbd39cc9927c8a48ca178b019c049520e2ca
parent22ce6499102c2ab87bbd8a303b5d26531c6e7df2
parentd5a27855459325290ace93538f5ceafb22dee27a
Merge branch 'master' into deprecate-screen-device-vars

Conflicts:
less/variables.less
less/variables.less