summary refs log tree commit diff
path: root/src/api/routes/users (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Oop, deprecated typeorm callTheArcaneBrony2022-08-271-1/+1
|
* Merge remote-tracking branch 'Maddy/fix/sendMemberInProfile' into stagingTheArcaneBrony2022-08-271-25/+61
|\
| * Merge remote-tracking branch 'upstream/staging' into fix/sendMemberInProfileMadeline2022-08-221-26/+59
| |
* | Merge remote-tracking branch 'Maddy/fix/claim_accounts' into stagingTheArcaneBrony2022-08-271-0/+9
|\ \
| * | Merge remote-tracking branch 'upstream/staging' into fix/claim_accountsMadeline2022-08-221-9/+17
| |/
* | prettierTheArcaneBrony2022-08-2026-129/+126
| |
* | Fix merge conflictsTheArcaneBrony2022-08-204-4/+3
| |
* | Add fallback to bcryptjsTheArcaneBrony2022-08-205-14/+58
|/
* restructure to single projectFlam3rboy2022-08-1327-0/+887