Merge branch 'master' into dev

This commit is contained in:
hacksalot committed 2018-01-25 14:48:35 -05:00
commit 394d5cf821
7 files changed
+75 -16

No files matched your search

+1
View File
@@ -179,6 +179,7 @@ _prep = ( src, dst, opts ) ->
_opts.noTips = opts.noTips
_opts.debug = opts.debug
_opts.sort = opts.sort
_opts.wkhtmltopdf = opts.wkhtmltopdf
that = @
# Set up callbacks for internal generators