Merge branch 'master' into all-contributors/add-dzmitryh

# Conflicts: # .all-contributorsrc # README.md
docs: add jjjimenez100 as a contributor (#1432 )
2020-07-29 19:34:26 +03:00 · 2020-07-29 19:33:18 +03:00 · 2020-07-29 19:31:35 +03:00 · 2020-07-28 17:09:51 +00:00 · 2020-07-28 17:09:50 +00:00
2 changed files with 32 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -291,6 +291,33 @@
        "code"
      ]
    },
+    {
+      "login": "dzmitryh",
+      "name": "Dima Gubin",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5390492?v=4",
+      "profile": "https://about.me/dzmitryh",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jjjimenez100",
+      "name": "Joshua Jimenez",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/22243493?v=4",
+      "profile": "https://github.com/jjjimenez100",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kaiwinter",
+      "name": "Kai Winter",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/110982?v=4",
+      "profile": "http://about.me/kaiwinter",
+      "contributions": [
+        "code"
+      ]
+    },
    {
      "login": "lbroman",
      "name": "lbroman",
--- a/README.md
+++ b/README.md
@@ -197,6 +197,11 @@ This project is licensed under the terms of the MIT license.
  <tr>
    <td align="center"><a href="https://przemeknowak.com"><img src="https://avatars1.githubusercontent.com/u/3254609?v=4" width="100px;" alt=""/><br /><sub><b>Przemek</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=pnowy" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/lbroman"><img src="https://avatars1.githubusercontent.com/u/86007?v=4" width="100px;" alt=""/><br /><sub><b>lbroman</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=lbroman" title="Code">💻</a></td>
+    <td align="center"><a href="http://about.me/kaiwinter"><img src="https://avatars0.githubusercontent.com/u/110982?v=4" width="100px;" alt=""/><br /><sub><b>Kai Winter</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=kaiwinter" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jjjimenez100"><img src="https://avatars3.githubusercontent.com/u/22243493?v=4" width="100px;" alt=""/><br /><sub><b>Joshua Jimenez</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=jjjimenez100" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://about.me/dzmitryh"><img src="https://avatars2.githubusercontent.com/u/5390492?v=4" width="100px;" alt=""/><br /><sub><b>Dima Gubin</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=dzmitryh" title="Code">💻</a></td>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	8bac0b44cf	Merge branch 'master' into all-contributors/add-dzmitryh # Conflicts: # .all-contributorsrc # README.md	2020-07-29 19:34:26 +03:00
allcontributors[bot]	1f900d164d	docs: add jjjimenez100 as a contributor (#1432 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä <ilkka.seppala@gofore.com>	2020-07-29 19:33:18 +03:00
allcontributors[bot]	5d21a03acd	docs: add kaiwinter as a contributor (#1431 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Ilkka Seppälä <ilkka.seppala@gofore.com>	2020-07-29 19:31:35 +03:00
allcontributors[bot]	6986a4c76d	docs: update .all-contributorsrc [skip ci]	2020-07-28 17:09:51 +00:00
allcontributors[bot]	ff4c237963	docs: update README.md [skip ci]	2020-07-28 17:09:50 +00:00