Skip to content
This repository has been archived by the owner on Jun 27, 2019. It is now read-only.

Minor changes to support better deployment #69

Merged
merged 1 commit into from
Nov 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ web/favicon.ico

# Generated via crontab
web/cotech-images.tgz

2 changes: 1 addition & 1 deletion git-hooks/post-merge
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ echo "==> running post-merge"
git rev-parse HEAD > commit.txt
composer update
cd ./web/app/themes/coop-tech-oowp-theme
composer update
composer install
npm install
gulp
./node_modules/gulp/bin/gulp.js # in case gulp not in $PATH
Expand Down