Merge branch 'master' into TTA-53-update-env-variables-info-in-time-tracker-ui-readme

nicolsss · web-flow · commit 368e0dcde899 · 2022-06-27T18:01:47.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 .dev.env filter=git-crypt diff=git-crypt
-.env filter=git-crypt diff=git-crypt
+.env filter=git-crypt diff=git-crypt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`.dev.env filter=git-crypt diff=git-crypt`
`2`		`-.env filter=git-crypt diff=git-crypt`
	`2`	`+.env filter=git-crypt diff=git-crypt`