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

# Conflicts: # .all-contributorsrc # README.md
docs: add leogtzr as a contributor (#1397 )
2020-07-29 18:12:14 +03:00 · 2020-07-29 18:11:09 +03:00 · 2020-07-28 16:54:07 +00:00 · 2020-07-28 16:54:06 +00:00
2 changed files with 22 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -291,6 +291,24 @@
        "code"
      ]
    },
+    {
+      "login": "hannespernpeintner",
+      "name": "Hannes",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1679437?v=4",
+      "profile": "https://bitbucket.org/hannespernpeintner/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "leogtzr",
+      "name": "Leo Gutiérrez Ramírez",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1211969?v=4",
+      "profile": "https://github.com/leogtzr",
+      "contributions": [
+        "code"
+      ]
+    },
    {
      "login": "npczwh",
      "name": "Zhang WH",
--- a/README.md
+++ b/README.md
@@ -146,6 +146,10 @@ This project is licensed under the terms of the MIT license.
    <td align="center"><a href="https://github.com/giorgosmav21"><img src="https://avatars2.githubusercontent.com/u/22855493?v=4" width="100px;" alt=""/><br /><sub><b>George Mavroeidis</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=giorgosmav21" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/oconnelc"><img src="https://avatars0.githubusercontent.com/u/1112973?v=4" width="100px;" alt=""/><br /><sub><b>Christopher O'Connell</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=oconnelc" title="Code">💻</a></td>
  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/leogtzr"><img src="https://avatars0.githubusercontent.com/u/1211969?v=4" width="100px;" alt=""/><br /><sub><b>Leo Gutiérrez Ramírez</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=leogtzr" title="Code">💻</a></td>
+    <td align="center"><a href="https://bitbucket.org/hannespernpeintner/"><img src="https://avatars3.githubusercontent.com/u/1679437?v=4" width="100px;" alt=""/><br /><sub><b>Hannes</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=hannespernpeintner" title="Code">💻</a></td>
+  </tr>
 </table>

 <!-- markdownlint-enable -->
Author	SHA1	Message	Date
Ilkka Seppälä	4927c468d9	Merge branch 'master' into all-contributors/add-hannespernpeintner # Conflicts: # .all-contributorsrc # README.md	2020-07-29 18:12:14 +03:00
allcontributors[bot]	d791c78501	docs: add leogtzr as a contributor (#1397 ) * 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 18:11:09 +03:00
allcontributors[bot]	a340c34441	docs: update .all-contributorsrc [skip ci]	2020-07-28 16:54:07 +00:00
allcontributors[bot]	db2bd39271	docs: update README.md [skip ci]	2020-07-28 16:54:06 +00:00