Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
Conflicts: docs/extend.html docs/templates/pages/extend.mustache
Showing
Please register or sign in to comment
Conflicts: docs/extend.html docs/templates/pages/extend.mustache