From b7f1ab665db1b0d16366b9ccd2285ae0c35bc655 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Mon, 18 Dec 2017 19:24:23 +0100 Subject: [PATCH 1/2] Prepare 2.2.5 release --- CHANGELOG | 4 ++++ MANIFEST.in | 2 +- docs/release-notes.md | 8 +++++++- material/assets/images/favicon.ico | Bin 1150 -> 0 bytes src/assets/images/favicon.ico | Bin 1150 -> 0 bytes 5 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 material/assets/images/favicon.ico delete mode 100644 src/assets/images/favicon.ico diff --git a/CHANGELOG b/CHANGELOG index acf18306c..13814bac0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +mkdocs-material-2.2.5 (2017-12-18) + + * Fixed #639: Broken default favicon + mkdocs-material-2.2.4 (2017-12-18) * Fixed #638: Build breaks with Jinja < 2.9 diff --git a/MANIFEST.in b/MANIFEST.in index 8f43a2f23..83f1af4f6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -recursive-include material *.ico *.js *.css *.html *.svg *.yml +recursive-include material *.js *.css *.html *.svg *.png *.yml recursive-exclude site * recursive-exclude * __pycache__ recursive-exclude * *.py[co] diff --git a/docs/release-notes.md b/docs/release-notes.md index 7f5f00ede..3ac7753c5 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -12,7 +12,7 @@ To determine the currently installed version, use the following command: ``` sh pip show mkdocs-material | grep -E ^Version -# Version 2.2.4 +# Version 2.2.5 ``` ### Material 1.x to 2.x @@ -38,6 +38,12 @@ pip show mkdocs-material | grep -E ^Version ## Changelog +### 2.2.5 _ December 18, 2017 + +* Fixed [#639][639]: Broken default favicon + + [639]: https://github.com/squidfunk/mkdocs-material/issues/639 + ### 2.2.4 _ December 18, 2017 * Fixed [#638][638]: Build breaks with Jinja < 2.9 diff --git a/material/assets/images/favicon.ico b/material/assets/images/favicon.ico deleted file mode 100644 index e85006a3ce1c6fd81faa6d5a13095519c4a6fc96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd6lF-yZh9L1kl>(HSEK`2y^4yB6->f+$wD)=oNY!UheIt03Q=;qj=;8*Bap_4*& za8yAl;wmmx5Yyi^7dXN-WYdJ-{qNqpcez|5t#Fr0qTSYcPTG`I2PBk8r$~4kg^0zN zCJe(rhix3do!L$bZ+IuZ{i08x=JR3=e+M4pv0KsKA??{u_*EFfo|`p&t`Vf=jn{)F z1fKk9hWsmYwqWAP^JO*5u*R;*L&dX3H$%S7oB$f0{ISh{QVXuncnzN67WQH2`lip7 zhX+VI$6x$1+$8gMjh4+1l0N#8_0Fh=N#EwpKk{SeE!)SHFB@xQFX3y+8sF#_@!bDW eIdI-IC`$c%>bk?KbPeN9RHtL<1^)v~#xMt8oB^@` diff --git a/src/assets/images/favicon.ico b/src/assets/images/favicon.ico deleted file mode 100644 index e85006a3ce1c6fd81faa6d5a13095519c4a6fc96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd6lF-yZh9L1kl>(HSEK`2y^4yB6->f+$wD)=oNY!UheIt03Q=;qj=;8*Bap_4*& za8yAl;wmmx5Yyi^7dXN-WYdJ-{qNqpcez|5t#Fr0qTSYcPTG`I2PBk8r$~4kg^0zN zCJe(rhix3do!L$bZ+IuZ{i08x=JR3=e+M4pv0KsKA??{u_*EFfo|`p&t`Vf=jn{)F z1fKk9hWsmYwqWAP^JO*5u*R;*L&dX3H$%S7oB$f0{ISh{QVXuncnzN67WQH2`lip7 zhX+VI$6x$1+$8gMjh4+1l0N#8_0Fh=N#EwpKk{SeE!)SHFB@xQFX3y+8sF#_@!bDW eIdI-IC`$c%>bk?KbPeN9RHtL<1^)v~#xMt8oB^@` From eb07d2410a88acf0c42869181c84c7db9d74026b Mon Sep 17 00:00:00 2001 From: squidfunk Date: Mon, 18 Dec 2017 19:30:06 +0100 Subject: [PATCH 2/2] Fixed legacy bash syntax --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index d49b6acfb..8f5d5fcfe 100755 --- a/.travis.sh +++ b/.travis.sh @@ -53,7 +53,7 @@ pushd /tmp mkdocs new test && cd test # Test Docker image build -docker run --rm -it -v `pwd`:/docs $TRAVIS_REPO_SLUG build --theme material +docker run --rm -it -v $(pwd):/docs $TRAVIS_REPO_SLUG build --theme material # Return to original directory popd