Merge remote-tracking branch 'origin/main' into new_architecture

author riqo <hernandeze2@xavier.edu>

Sat, 19 Jun 2021 16:30:29 +0000 (11:30 -0500)

committer riqo <hernandeze2@xavier.edu>

Sat, 19 Jun 2021 16:30:29 +0000 (11:30 -0500)
author riqo <hernandeze2@xavier.edu>
Sat, 19 Jun 2021 16:30:29 +0000 (11:30 -0500)
committer riqo <hernandeze2@xavier.edu>
Sat, 19 Jun 2021 16:30:29 +0000 (11:30 -0500)
diff --cc package.json
Simple merge
diff --cc src/authPayload.ts

index 0000000000000000000000000000000000000000,61d68b6fff66a0d9a8b9fddfc8428fc83e1f9e25..61d68b6fff66a0d9a8b9fddfc8428fc83e1f9e25

mode 000000,100644..100644
--- /dev/null
--- 2/src/background/authPayload.ts
+++ b/src/authPayload.ts
author	riqo <hernandeze2@xavier.edu>
	Sat, 19 Jun 2021 16:30:29 +0000 (11:30 -0500)
committer	riqo <hernandeze2@xavier.edu>
	Sat, 19 Jun 2021 16:30:29 +0000 (11:30 -0500)
		1	2
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
src/authPayload.ts	patch \|	\|	diff2 \|	blob \| history