Update history to reflect merge of #1958

This commit is contained in:
Matt Rogers 2014-01-15 23:24:24 -06:00
parent ebc95274b9
commit 8337cbb31f
1 changed files with 1 additions and 0 deletions

View File

@ -38,6 +38,7 @@
* Change short opts for host and port for `jekyll docs` to be consistent with * Change short opts for host and port for `jekyll docs` to be consistent with
other subcommands (#1877) other subcommands (#1877)
* Fix typos (#1910) * Fix typos (#1910)
* Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958)
### Development Fixes ### Development Fixes
* Add a link to the site in the README.md file (#1795) * Add a link to the site in the README.md file (#1795)