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

Merge branch 'api-v3-user' of github.com:HabitRPG/habitrpg into api-v3-user

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-21 12:03:26 +01:00
parent 7866f7393b 07247033b2
commit 2f4e6e015a
3 changed files with 253 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/src/controllers/api-v3/user.js
View File

@@ -5,7 +5,7 @@ import {
NotAuthorized,
} from '../../libs/api-v3/errors';
import passwordUtils from '../../libs/api-v3/password';
import User from '../../models/user';
import { model as User } from '../../models/user';
import EmailUnsubscription from '../../models/emailUnsubscription';
import { sendTxn as sendTxnEmail } from '../../libs/api-v3/email';