server.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	implement guild profiles and fix user profiles	Puyodead1	2022-08-29	4	-7/+120
*	Oop, deprecated typeorm call	TheArcaneBrony	2022-08-27	1	-1/+1
*	Merge remote-tracking branch 'upstream/dev/staging_2' into staging	TheArcaneBrony	2022-08-27	1	-8/+168
\|\
\| *	Add missing SKU	TheArcaneBrony	2022-08-27	1	-8/+168
* \|	Merge remote-tracking branch 'Maddy/fix/sendMemberInProfile' into staging	TheArcaneBrony	2022-08-27	1	-25/+61
\|\ \
\| * \|	Merge remote-tracking branch 'upstream/staging' into fix/sendMemberInProfile	Madeline	2022-08-22	1	-26/+59
* \| \|	Merge remote-tracking branch 'Maddy/fix/claim_accounts' into staging	TheArcaneBrony	2022-08-27	2	-5/+20
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Merge remote-tracking branch 'upstream/staging' into fix/claim_accounts	Madeline	2022-08-22	2	-11/+26
\| \|/
* \|	Merge remote-tracking branch 'upstream/staging' into feat/captchaVerify	Madeline	2022-08-25	115	-702/+781
\|\ \
\| * \|	Check Captcha	Scott Gould	2022-08-23	2	-5/+37
\| * \|	prettier	TheArcaneBrony	2022-08-20	113	-681/+696
\| * \|	Fix merge conflicts	TheArcaneBrony	2022-08-20	4	-4/+3
\| * \|	Make canvas optional	TheArcaneBrony	2022-08-20	1	-5/+11
\| * \|	Add fallback to bcryptjs	TheArcaneBrony	2022-08-20	7	-20/+77
\| \|/
* /	Merge remote-tracking branch 'upstream/staging' into feat/captchaVerify	Madeline	2022-08-22	2	-7/+22
\|/
*	Fix the latest SKU errors and further debranding	Erkin Alp Güney	2022-08-16	1	-18/+29
*	Fix rebase conflicts	TheArcaneBrony	2022-08-15	3	-0/+124
*	restructure to single project	Flam3rboy	2022-08-13	113	-0/+5092