Fix merge conflicts
This commit is contained in:
@ -13,6 +13,8 @@
|
||||
* Remove `base_path` include from `/test` pages.
|
||||
* Reduce font-size of page meta in list/grid items.
|
||||
* Improve feature row styling when used with `archive` layout. [#1484](https://github.com/mmistakes/minimal-mistakes/issues/1484)
|
||||
* Improve German translations. [#1511](https://github.com/mmistakes/minimal-mistakes/pull/1511)
|
||||
* Update Font Awesome to `5.0.6`. [#1513](https://github.com/mmistakes/minimal-mistakes/pull/1513)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@ -23,6 +25,7 @@
|
||||
* Properly escape quotes in `site.social.name` and `site.name`. [#1485](https://github.com/mmistakes/minimal-mistakes/pull/1485)
|
||||
* Fix typo in upgrading documentation. [#1487](https://github.com/mmistakes/minimal-mistakes/pull/1487)
|
||||
* Fix `border-bottom` for Gist line numbers.
|
||||
* Replace `|` with HTML entity when used as title separator. [#760](https://github.com/mmistakes/minimal-mistakes/issues/760)
|
||||
|
||||
## [4.9.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.9.0)
|
||||
|
||||
|
Reference in New Issue
Block a user