Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2019-03-14 14:11:25 -05:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.87.1",
"version": "4.87.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.87.1",
"version": "4.87.2",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^3.5.2",
@@ -45,7 +45,7 @@
.row.text-center
h2.mx-auto.text-payment {{ $t('choosePaymentMethod') }}
.payments-column
button.purchase.btn.btn-primary.payment-button.payment-item(@click='showStripe()')
button.purchase.btn.btn-primary.payment-button.payment-item(@click='showStripe({})')
.svg-icon.credit-card-icon(v-html="icons.creditCardIcon")
| {{ $t('card') }}
button.btn.payment-item.paypal-checkout.payment-button(@click="openPaypal(paypalCheckoutLink, 'gems')")