diff options
| author | Chris McDonough <chrism@plope.com> | 2018-07-02 13:52:55 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2018-07-02 13:52:55 -0400 |
| commit | 0c8ca237d1bb1ff0f6e3776a3c868edb040fa791 (patch) | |
| tree | 57498768d48ce74a753dec8f359b5646acf30655 /docs/quick_tutorial/cookiecutters | |
| parent | 50efc321cb14d76433216783c11b9eb99a7d44c8 (diff) | |
| parent | 57a896f103c7378fb285f6594228578a5324d672 (diff) | |
| download | pyramid-0c8ca237d1bb1ff0f6e3776a3c868edb040fa791.tar.gz pyramid-0c8ca237d1bb1ff0f6e3776a3c868edb040fa791.tar.bz2 pyramid-0c8ca237d1bb1ff0f6e3776a3c868edb040fa791.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tutorial/cookiecutters')
| -rw-r--r-- | docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 | 2 | ||||
| -rw-r--r-- | docs/quick_tutorial/cookiecutters/setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 index 13a65ff72..90d2d106a 100644 --- a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 +++ b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 @@ -16,7 +16,7 @@ <!-- Custom styles for this scaffold --> <link href="{{request.static_url('cc_starter:static/theme.css')}}" rel="stylesheet"> - <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!-- HTML5 shiv and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js" integrity="sha384-0s5Pv64cNZJieYFkXYOTId2HMA2Lfb6q2nAcx2n0RTLUnCAoTTsS0nKEO27XyKcY" crossorigin="anonymous"></script> <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js" integrity="sha384-ZoaMbDF+4LeFxg6WdScQ9nnR1QC2MIRxA1O9KWEXQwns1G8UNyIEZIQidzb0T1fo" crossorigin="anonymous"></script> diff --git a/docs/quick_tutorial/cookiecutters/setup.py b/docs/quick_tutorial/cookiecutters/setup.py index e47cdf8ea..0d1b3f70e 100644 --- a/docs/quick_tutorial/cookiecutters/setup.py +++ b/docs/quick_tutorial/cookiecutters/setup.py @@ -10,8 +10,8 @@ with open(os.path.join(here, 'CHANGES.txt')) as f: requires = [ 'pyramid', - 'pyramid_jinja2', 'pyramid_debugtoolbar', + 'pyramid_jinja2', 'waitress', ] |