Skip to content

Commit

Permalink
Merge branch 'release/2.4.33' into craft-webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Welch committed Apr 6, 2021
2 parents 972a37f + a947e16 commit bd1e788
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# nystudio107/craft Change Log

## 2.4.33 - 2021.04.06
### Changed
* Use `rm -f` to ensure no errors if the file doesn’t exist

## 2.4.32 - 2021.04.05
### Changed
* Use Tailwind CSS `^2.1.0` with JIT
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ restoredb: up
$(filter-out $@,$(MAKECMDGOALS))
update:
docker-compose down
rm cms/composer.lock
rm buildchain/package-lock.json
rm -f cms/composer.lock
rm -f buildchain/package-lock.json
docker-compose up
update-clean:
docker-compose down
rm cms/composer.lock
rm -f cms/composer.lock
rm -rf cms/vendor/
rm buildchain/package-lock.json
rm -f buildchain/package-lock.json
rm -rf buildchain/node_modules/
docker-compose up
up:
Expand Down

0 comments on commit bd1e788

Please sign in to comment.