Merge commit '0e4e22fa716ddb923e5313711761fbadd676d9a9' into changes

sbenitezb · sbenitezb · commit 2fbf6203f6a6 · 2022-12-20T16:27:47.000-03:00
# Conflicts:
#	projects/shadow/source.txt
diff --git a/projects/shadow/source.txt b/projects/shadow/source.txt
@@ -1 +1 @@
-git https://github.com/mfiano/shadow
+git https://github.com/mfiano/shadow.git

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-git https://github.com/mfiano/shadow`
	`1`	`+git https://github.com/mfiano/shadow.git`