Skip to content
Snippets Groups Projects
Commit e9a1c7e0 authored by MeowZheng's avatar MeowZheng
Browse files

Merge branch '1.x' into dev-1.x

parents eafb5da8 fd6e42de
No related branches found
No related tags found
No related merge requests found
......@@ -184,4 +184,4 @@ workflows:
only:
- dev-1.x
- 1.x
- master
- master
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment