sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-14 02:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
SabreCat 2021-12-21 16:03:39 -06:00
commit 2698251bd2
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/api/unit/libs/payments/payments.test.js
View file

@ -247,7 +247,7 @@ describe('payments/index', () => {
context('No Active Promotion', () => {
beforeEach(() => {
sinon.stub(worldState, 'getCurrentEvent').returns(null);
sinon.stub(worldState, 'getCurrentEventList').returns([]);
});
afterEach(() => {

1
website/common/locales/en/limited.json
View file

@ -192,6 +192,7 @@
"mayYYYY": "May <%= year %>",
"juneYYYY": "June <%= year %>",
"novemberYYYY": "November <%= year %>",
"januaryYYYY": "January <%= year %>",
"dateEndJuly": "July 31",
"dateEndAugust": "August 31",
"dateEndSeptember": "September 21",