Merge branch 'develop' of https://github.com/userfrosting/UserFrosting …

…into develop
userfrosting · Feb 24, 2018 · cb52239 · cb52239
2 parents 95d20b6 + 83b0174
commit cb52239
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,7 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - The console IO instance is not available anymore in migrations.
 - Removed the `io` property from migration classes.
 - Removed Bakery `projectRoot` property. Use the `\UserFrosting\ROOT_DIR` constant instead.
-- Removed `preted` option from Bakery `migrate:refresh` and `migrate:reset` commands.
+- Removed `pretend` option from Bakery `migrate:refresh` and `migrate:reset` commands.
 
 ### Fixed