diff --git a/CHANGELOG.md b/CHANGELOG.md index 838b3dad..4c41c8ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +##[2016-06-06] +### Changed +- Pin Bootstrap CSS and JS to v4.0.0-alpha.2, use minified versions + ##[2016-06-05] ### Added - Configurable admin for users (@pydanny, @jayfk, @dezoito) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index fb7be02e..80025914 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -83,6 +83,7 @@ Listed in alphabetical order. Jens Nilsson `@phiberjenz` Julio Castillo `@juliocc`_ Kaido Kert `@kaidokert`_ + kappataumu `@kappataumu`_ @kappataumu Kaveh `@ka7eh`_ Kevin A. Stone Kevin Ndung'u `@kevgathuku`_ @@ -162,6 +163,7 @@ Listed in alphabetical order. .. _@jvanbrug: https://github.com/jvanbrug .. _@ka7eh: https://github.com/ka7eh .. _@kaidokert: https://github.com/kaidokert +.. _@kappataumu: https://github.com/kappataumu .. _@kevgathuku: https://github.com/kevgathuku .. _@knitatoms: https://github.com/knitatoms .. _@MathijsHoogland: https://github.com/MathijsHoogland diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index a1e2a5ac..bc9dc552 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -15,7 +15,7 @@ {% block css %} - + @@ -95,7 +95,7 @@ - +