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

# Conflicts: # .all-contributorsrc # README.md
docs: add okinskas as a contributor (#1377 )
2020-07-28 20:36:14 +03:00 · 2020-07-28 20:33:05 +03:00 · 2020-07-28 20:23:30 +03:00 · 2020-07-28 16:37:44 +00:00 · 2020-07-28 16:37:43 +00:00
2 changed files with 20 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -291,6 +291,24 @@
        "code"
      ]
    },
+    {
+      "login": "ankurkaushal",
+      "name": "Ankur Kaushal",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2236616?v=4",
+      "profile": "https://github.com/ankurkaushal",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "okinskas",
+      "name": "Ovidijus Okinskas",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/20372387?v=4",
+      "profile": "https://www.linkedin.com/in/ovidijus-okinskas/",
+      "contributions": [
+        "code"
+      ]
+    },
    {
      "login": "robertt240",
      "name": "Robert Kasperczyk",
--- a/README.md
+++ b/README.md
@@ -114,6 +114,8 @@ This project is licensed under the terms of the MIT license.
    <td align="center"><a href="https://github.com/gvsharma"><img src="https://avatars1.githubusercontent.com/u/6648152?v=4" width="100px;" alt=""/><br /><sub><b>GVSharma</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=gvsharma" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/SrdjanPaunovic"><img src="https://avatars1.githubusercontent.com/u/22815104?v=4" width="100px;" alt=""/><br /><sub><b>Srđan Paunović</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=SrdjanPaunovic" title="Code">💻</a></td>
    <td align="center"><a href="https://sideris.xyz/"><img src="https://avatars3.githubusercontent.com/u/5484694?v=4" width="100px;" alt=""/><br /><sub><b>Petros G. Sideris</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=sideris" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ankurkaushal"><img src="https://avatars2.githubusercontent.com/u/2236616?v=4" width="100px;" alt=""/><br /><sub><b>Ankur Kaushal</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=ankurkaushal" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/ovidijus-okinskas/"><img src="https://avatars0.githubusercontent.com/u/20372387?v=4" width="100px;" alt=""/><br /><sub><b>Ovidijus Okinskas</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=okinskas" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/robertt240"><img src="https://avatars1.githubusercontent.com/u/9137432?v=4" width="100px;" alt=""/><br /><sub><b>Robert Kasperczyk</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=robertt240" title="Code">💻</a></td>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	0364761bf0	Merge branch 'master' into all-contributors/add-ankurkaushal # Conflicts: # .all-contributorsrc # README.md	2020-07-28 20:36:14 +03:00
allcontributors[bot]	cfba28f9a4	docs: add okinskas as a contributor (#1377 ) * 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-28 20:33:05 +03:00
allcontributors[bot]	c0d2c7fdb0	docs: add robertt240 as a contributor (#1376 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2020-07-28 20:23:30 +03:00
allcontributors[bot]	8a4e1a1314	docs: update .all-contributorsrc [skip ci]	2020-07-28 16:37:44 +00:00
allcontributors[bot]	f724b3b8f4	docs: update README.md [skip ci]	2020-07-28 16:37:43 +00:00