Merge branch 'master' into master

lukerollans · Apr 1, 2019 · c5f42b0 · c5f42b0
2 parents 384cb79 + 684fe57
commit c5f42b0
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,9 @@ If we're missing a Unicode emoji, please check if it's been added to our upstrea
 Emoji | Aliases
 ----- | -------
 <img src="img-buildkite-64/gatsby.png" width="20" height="20" alt="gatsby"/> | `:gatsby:`
+<img src="img-buildkite-64/fluentd.png" width="20" height="20" alt="fluentd"/> | `:fluentd:`
+<img src="img-buildkite-64/cloudsmith.png" width="20" height="20" alt="cloudsmith"/> | `:cloudsmith:`
+<img src="img-buildkite-64/sidekiq.png" width="20" height="20" alt="sidekiq"/> | `:sidekiq:`
 <img src="img-buildkite-64/hadolint.png" width="20" height="20" alt="hadolint"/> | `:hadolint:`
 <img src="img-buildkite-64/purescript.png" width="20" height="20" alt="purescript"/> | `:purescript:`
 <img src="img-buildkite-64/haskell.png" width="20" height="20" alt="haskell"/> | `:haskell:`, `:hs:`

diff --git a/img-buildkite-64.json b/img-buildkite-64.json
@@ -5,6 +5,24 @@
     "category": "Buildkite",
     "aliases": []
   },
+  {
+    "name": "fluentd",
+    "image": "img-buildkite-64/fluentd.png",
+    "category": "Buildkite",
+    "aliases": []
+  },
+  {
+    "name": "cloudsmith",
+    "image": "img-buildkite-64/cloudsmith.png",
+    "category": "Buildkite",
+    "aliases": []
+  },
+  {
+    "name": "sidekiq",
+    "image": "img-buildkite-64/sidekiq.png",
+    "category": "Buildkite",
+    "aliases": []
+  },
   {
     "name": "hadolint",
     "image": "img-buildkite-64/hadolint.png",
@@ -260,14 +278,16 @@
     "image": "img-buildkite-64/chef-logo.png",
     "category": "Buildkite",
     "aliases": [
-      "opscode"
+      "opscode", "chef-logo"
     ]
   },
   {
     "name": "inspec",
     "image": "img-buildkite-64/chef-inspec.png",
     "category": "Buildkite",
-    "aliases": []
+    "aliases": [
+      "chef-inspec"
+    ]
   },
   {
     "name": "hyper",
@@ -2008,5 +2028,11 @@
     "image": "img-buildkite-64/splunk.png",
     "category": "Buildkite",
     "aliases": []
+  },
+  {
+    "name": "batman",
+    "image": "img-buildkite-64/batman.png",
+    "category": "Buildkite",
+    "aliases": []
   }
 ]
diff --git a/img-buildkite-64/cloudsmith.png b/img-buildkite-64/cloudsmith.png
diff --git a/img-buildkite-64/fluentd.png b/img-buildkite-64/fluentd.png
diff --git a/img-buildkite-64/sidekiq.png b/img-buildkite-64/sidekiq.png