diff options
| author | Mark Otto <otto@github.com> | 2012-12-09 05:40:42 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-12-09 05:40:42 +0400 |
| commit | bc0b94a3fdc8fe480c74f4494073e2c0addb265e (patch) | |
| tree | e13fec2ed829b4586fa4044fffc8dbfadddae54e /composer.json | |
| parent | be5f31480b53555c492e0077c8bb9f419fc48f62 (diff) | |
| parent | 9376a7c221a64c2bf508d02ea2ccd85748d10fcc (diff) | |
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
Diffstat (limited to 'composer.json')
0 files changed, 0 insertions, 0 deletions