Merge remote-tracking branch 'origin/master' into develop

keyboards/artemis/paragon/info.json

@@ -20,7 +20,7 @@
     "url": "",
     "encoder": {
         "rotary": [
-            { "pin_a": "D3", "pin_b": "D5" }
+            { "pin_a": "D3", "pin_b": "D5", "resolution": 2 }
         ]
     },
     "usb": {