Fix archive pattern in .gitignore
Merge local-deploy