Phillip Thelen 87aebcc19e Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix ...

# Conflicts:
#	test/api/unit/libs/payments/apple.test.js
#	website/server/libs/payments/subscriptions.js

2023-02-06 11:19:00 +01:00

..

client

fix(lint): revert bad lint rule again

2023-01-31 11:00:08 -06:00

common

chore(content): add February subscriber items (#14466)

2023-01-31 10:33:36 -06:00

raw_sprites

Sprites: re-add previous offsets to sprites (#13933)

2022-04-15 14:14:48 -05:00

server

Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix

2023-02-06 11:19:00 +01:00