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

# Conflicts: # .all-contributorsrc # README.md
docs: add Harshrajsinh as a contributor (#1439 )
2020-07-29 19:46:57 +03:00 · 2020-07-29 19:45:07 +03:00 · 2020-07-29 19:43:26 +03:00 · 2020-07-28 17:12:18 +00:00 · 2020-07-28 17:12:17 +00:00
2 changed files with 20 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -291,6 +291,24 @@
        "code"
      ]
    },
+    {
+      "login": "Deathnerd",
+      "name": "Wes Gilleland",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1685953?v=4",
+      "profile": "http://theerroris.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Harshrajsinh",
+      "name": "Harshraj Thakor",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/22811531?v=4",
+      "profile": "https://github.com/Harshrajsinh",
+      "contributions": [
+        "code"
+      ]
+    },
    {
      "login": "MaVdbussche",
      "name": "Martin Vandenbussche",
--- a/README.md
+++ b/README.md
@ -209,6 +209,8 @@ This project is licensed under the terms of the MIT license.
  <tr>
    <td align="center"><a href="https://alexsomai.com"><img src="https://avatars1.githubusercontent.com/u/5720977?v=4" width="100px;" alt=""/><br /><sub><b>Alexandru Somai</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=alexsomai" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/MaVdbussche"><img src="https://avatars1.githubusercontent.com/u/26136934?v=4" width="100px;" alt=""/><br /><sub><b>Martin Vandenbussche</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=MaVdbussche" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Harshrajsinh"><img src="https://avatars2.githubusercontent.com/u/22811531?v=4" width="100px;" alt=""/><br /><sub><b>Harshraj Thakor</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Harshrajsinh" title="Code">💻</a></td>
+    <td align="center"><a href="http://theerroris.me"><img src="https://avatars0.githubusercontent.com/u/1685953?v=4" width="100px;" alt=""/><br /><sub><b>Wes Gilleland</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Deathnerd" title="Code">💻</a></td>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	1007942198	Merge branch 'master' into all-contributors/add-Deathnerd # Conflicts: # .all-contributorsrc # README.md	2020-07-29 19:46:57 +03:00
allcontributors[bot]	34a36cb519	docs: add Harshrajsinh as a contributor (#1439 ) * 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:45:07 +03:00
allcontributors[bot]	62ac59afda	docs: add MaVdbussche as a contributor (#1438 ) * 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:43:26 +03:00
allcontributors[bot]	f88b13e7cf	docs: update .all-contributorsrc [skip ci]	2020-07-28 17:12:18 +00:00
allcontributors[bot]	28e9f8f5a0	docs: update README.md [skip ci]	2020-07-28 17:12:17 +00:00