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

resolving conflicts

Browse Source
This commit is contained in:
Victor Piousbox
2016-04-04 16:37:51 +00:00
parent 14b0ec8b03 68ff26e6d6
commit 4c0f9ed1c8
20 changed files with 582 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/script/index.js
View File

@@ -121,6 +121,9 @@ import openMysteryItem from './ops/openMysteryItem';
import addWebhook from './ops/addWebhook';
import updateWebhook from './ops/updateWebhook';
import deleteWebhook from './ops/deleteWebhook';
import releasePets from './ops/releasePets';
import releaseBoth from './ops/releaseBoth';
import releaseMounts from './ops/releaseMounts';
api.ops = {
scoreTask,
@@ -143,6 +146,9 @@ api.ops = {
addWebhook,
updateWebhook,
deleteWebhook,
releasePets,
releaseBoth,
releaseMounts,
};
import handleTwoHanded from './fns/handleTwoHanded';