Merge branch 'master' into dev

xwings · xwings · commit a169eb900243 · 2020-12-09T12:01:13.000+08:00
diff --git a/qiling/__version__.py b/qiling/__version__.py
@@ -1 +1 @@
-__version__ = "1.2.1" + "-dev"
+__version__ = "1.2"
