Skip to content

Commit

Permalink
Merge branch 'release' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreCat committed Mar 14, 2019
2 parents 994082a + c08b251 commit f1b5ce9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion website/client/components/payments/buyGemsModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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')")
Expand Down

0 comments on commit f1b5ce9

Please sign in to comment.