Skip to content

Commit 974beca

Browse files
committed
merge master, fix conflicts
2 parents 2b5e502 + 407051c commit 974beca

File tree

511 files changed

+37700
-19269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+37700
-19269
lines changed

.gitconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[alias]
2+
devsh = "!f() { git -c submodule.ci.update=checkout -c submodule.Ditt-Reference-Scenes.update=checkout \"$@\"; }; f"

0 commit comments

Comments
 (0)