Current build 022522 #17

Merged

innocuous-symmetry merged 5 commits from current-build-022522 into master 2022-02-25 20:11:11 +00:00

Conversation 1 Commits 5 Files Changed 6 +88 -67

5 Commits

Author	SHA1	Message	Date
Mikayla Dobson	4f13c5d008	merge conflict handling	2022-02-25 14:10:17 -06:00
Mikayla Dobson	9e520995bc	fixed merge conflict	2022-02-25 14:00:49 -06:00
Mikayla Dobson	84ca93ef8e	cleaned up formatting	2022-02-25 13:51:35 -06:00
Mikayla Dobson	6c3165e9fe	added dependency to useEffect	2022-02-25 13:41:02 -06:00
Mikayla Dobson	b72db28c43	restored video function, app renders without crashing	2022-02-23 16:10:26 -06:00