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

keyboards/illusion/rosa/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x696B // ik -> illusion keyboards
+#define VENDOR_ID 0x694B // iK -> illusion keyboards
 #define PRODUCT_ID 0x6952 // iR -> illusion Rosa
 #define DEVICE_VER 0x0001
 #define MANUFACTURER illusion keyboards