Merge branch '7080-t-axolotl_merge' into 'v1-t'

axolotl: Specify lineage-20 branch for upstream merge

See merge request !1

.gitlab-ci.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,7 @@ include:
		- project: 'e/templates'
		ref: master
		file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'

		t:
		variables:
		UPSTREAM_BRANCH: lineage-20