diff options
| author | Mark Otto <[email protected]> | 2014-11-09 23:12:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-11-09 23:12:02 -0800 |
| commit | c4847c8f6ba39c331e4f0bfcd4f8d02ba4fa2fa6 (patch) | |
| tree | 1723c1de52e5ca029615af48bf02cf55e303eae2 | |
| parent | eb74a8cbf363699eb822057650ddff2f36765ec9 (diff) | |
| parent | 1764c6e5090a687f3a3f3fc4a8ee595eea22a03f (diff) | |
| download | bootstrap-c4847c8f6ba39c331e4f0bfcd4f8d02ba4fa2fa6.tar.xz bootstrap-c4847c8f6ba39c331e4f0bfcd4f8d02ba4fa2fa6.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 89bad886f..d2a245952 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ after_script: - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi env: global: - - JEKYLL_VERSION: 2.4.0 + - JEKYLL_VERSION: 2.5.1 - ROUGE_VERSION: 1.7.2 - SAUCE_USERNAME: bootstrap - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" @@ -67,7 +67,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built ### Running documentation locally -1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.4.x). +1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x). - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line. |