diff options
| author | Mark Otto <[email protected]> | 2014-03-09 16:11:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-09 16:11:04 -0700 |
| commit | b263a0197be84f4018c124b738e07e35c42d493f (patch) | |
| tree | c689aa917b65ee0ce661e52dc6388aab7e27a64a /docs | |
| parent | 2f7b04a192f271f63e83db9e2e6322b63abff252 (diff) | |
| parent | 68b3e3f3be1d326474a7f3d2fbc82f349f7815fc (diff) | |
| download | bootstrap-b263a0197be84f4018c124b738e07e35c42d493f.tar.xz bootstrap-b263a0197be84f4018c124b738e07e35c42d493f.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/js/src/customizer.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/src/customizer.js index a0e4a28d1..4ce304f1a 100644 --- a/docs/assets/js/src/customizer.js +++ b/docs/assets/js/src/customizer.js @@ -45,11 +45,11 @@ window.onload = function () { // wait for load in a dumb way because B-0 function createGist(configJson) { var data = { - 'description': 'Bootstrap Customizer Config', + description: 'Bootstrap Customizer Config', 'public': true, - 'files': { + files: { 'config.json': { - 'content': configJson + content: configJson } } } |