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

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-07-28 10:01:31 -05:00
parent 35a6f4cb19 9490159f64
commit 7546733ae9
63 changed files with 5660 additions and 5605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/common/script/libs/achievements.js
View File

@@ -201,6 +201,7 @@ function _getBasicAchievements (user, language) {
_addSimple(result, user, { path: 'rosyOutlook', language });
_addSimple(result, user, { path: 'bugBonanza', language });
_addSimple(result, user, { path: 'bareNecessities', language });
_addSimple(result, user, { path: 'freshwaterFriends', language });
_addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
_addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });