krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release

Browse Source
This commit is contained in:
SabreCat
2022-09-30 15:25:27 -05:00
parent 3582e233be 08f0374b46
commit 8cd9536bdc
95 changed files with 915 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/server/models/user/methods.js
View File

@@ -23,7 +23,7 @@ import amazonPayments from '../../libs/payments/amazon'; // eslint-disable-line
import stripePayments from '../../libs/payments/stripe'; // eslint-disable-line import/no-cycle
import paypalPayments from '../../libs/payments/paypal'; // eslint-disable-line import/no-cycle
import { model as NewsPost } from '../newsPost';
import { model as Transaction } from '../transaction';
import { TransactionModel as Transaction } from '../transaction';
const { daysSince } = common;