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

keyboards/flx/virgo/config.h

@@ -70,6 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_EFFECT_RGB_TEST
     #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/

keyboards/flx/virgo/info.json

@@ -1,7 +1,7 @@
 {
     "keyboard_name": "FLX Virgo",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "mechmerlin",
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -99,5 +99,4 @@
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }