Merge remote-tracking branch 'origin/develop' into effect-parenting

OpenShot · Apr 13, 2021 · c27071b · c27071b
2 parents ed72fc8 + fbc8a9b
commit c27071b
Show file tree

Hide file tree

Showing 7 changed files with 935 additions and 933 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+