Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip
Conflicts: bootstrap.css
Showing
+388 -1
lib/progress-bars.less
0 → 100644
Please register or sign in to comment
Conflicts: bootstrap.css