diff options
| author | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
| commit | 15c7e73abd8d97f0139d177d05c94e26faa17dd2 (patch) | |
| tree | 5d9a2317d17b669fe4a9ce6863ea59f0ddeea430 /package.json | |
| parent | cb0fed66933d179b5bc3669a1df7df00b5688cbe (diff) | |
| parent | c55329085ebc6d05d91412251331c0613ea2250b (diff) | |
| download | bootstrap-15c7e73abd8d97f0139d177d05c94e26faa17dd2.tar.xz bootstrap-15c7e73abd8d97f0139d177d05c94e26faa17dd2.zip | |
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
Diffstat (limited to 'package.json')
0 files changed, 0 insertions, 0 deletions