Merge remote-tracking branch 'backstage/master' into erikengervall/plugin-release-manager-as-a-service

microsite/data/plugins/circleci.yaml

@@ -5,7 +5,7 @@ authorUrl: https://github.com/spotify
 category: CI/CD
 description: Automate your development process with CI hosted in the cloud or on a private server.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/circleci
-iconUrl: https://www.saaves.com/storage/brochure/logo-circleci-icon1583764538.png
+iconUrl: img/circleci.png
 npmPackageName: '@backstage/plugin-circleci'
 tags:
   - ci

microsite/data/plugins/cost-insights.yaml

@@ -5,7 +5,7 @@ authorUrl: https://github.com/spotify
 category: Discovery
 description: Visualize, understand and optimize your team's cloud costs.
 documentation: https://github.com/backstage/backstage/tree/master/plugins/cost-insights
-iconUrl: https://www.materialui.co/materialIcons/editor/monetization_on_white_192x192.png
+iconUrl: img/cost-insights.png
 npmPackageName: '@backstage/plugin-cost-insights'
 tags:
   - web

microsite/sidebars.json

@@ -135,13 +135,13 @@
       },
       {
         "type": "subcategory",
-        "label": "LDAP",
-        "ids": ["integrations/ldap/org"]
+        "label": "Google GCS",
+        "ids": ["integrations/google-cloud-storage/locations"]
       },
       {
         "type": "subcategory",
-        "label": "Google GCS",
-        "ids": ["integrations/google-cloud-storage/locations"]
+        "label": "LDAP",
+        "ids": ["integrations/ldap/org"]
       }
     ],
     "Plugins": [