Merge branch 'master' into main

sgratzl · sgratzl · commit 904e9ea211d6 · 2020-12-11T15:46:35.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -20,7 +20,9 @@
 *.less text
 *.styl text
 *.js text
+*.jsx text
 *.ts text
+*.tsx text
 *.coffee text
 *.json text
 *.htm text
