Merge branch 'master' into release/2.0
Fix currency encoding in emails. Closes #2143
Fix currency encoding in emails. Closes #2143
Upgrade routine for v2.0. #2218
Adjust upgrade page to allow multi-step upgrades with the action arg or single step (as previously used). #2218
Tweak upgrade routine for 2.0. #2218
Fix issue with card type not updating as card number is changed. #2303
Change invalid zip error
Change invalid zip error
Fix accidental activation process that fires when other license keys are deactivated. CLoses #2133
First pass at new [edd_register] short code. #1724
Merge branch 'issue/1724' into release/2.0
remove unnecessary ! is logged in check. #1724
Make action names consistent
Introduce edd_get_cart_fee_tax() and allow fees to be marked as exclusive of tax. #1021
Clean up the add_fee() method. #1021
Fix merge conflict
Brackets
Fix merge conflict
Remove console.log