Merge branch 'develop' into new-icon-netbeans

Author: canaleal

devicon.json

@@ -11333,6 +11333,31 @@
             }
         ]
     },
+    {
+        "name": "vaadin",
+        "altnames": [],
+        "tags": [
+            "framework",
+            "java",
+            "web"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "original-wordmark"
+            ],
+            "font": [
+                "original"
+            ]
+        },
+        "color": "#00b4f0",
+        "aliases": [
+            {
+                "base": "original",
+                "alias": "plain"
+            }
+        ]
+    },
     {
         "name": "vagrant",
         "altnames": [],