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

# Conflicts: # .all-contributorsrc # README.md
docs: update .all-contributorsrc [skip ci]
2020-07-29 18:19:14 +03:00 · 2020-07-28 16:56:53 +00:00 · 2020-07-28 16:56:52 +00:00
2 changed files with 10 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -291,6 +291,15 @@
        "code"
      ]
    },
+    {
+      "login": "waisuan",
+      "name": "Evan Sia Wai Suan",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/10975700?v=4",
+      "profile": "https://github.com/waisuan",
+      "contributions": [
+        "code"
+      ]
+    },
    {
      "login": "AnaghaSasikumar",
      "name": "AnaghaSasikumar",
--- a/README.md
+++ b/README.md
@ -154,6 +154,7 @@ This project is licensed under the terms of the MIT license.
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/AnaghaSasikumar"><img src="https://avatars2.githubusercontent.com/u/42939261?v=4" width="100px;" alt=""/><br /><sub><b>AnaghaSasikumar</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=AnaghaSasikumar" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/waisuan"><img src="https://avatars2.githubusercontent.com/u/10975700?v=4" width="100px;" alt=""/><br /><sub><b>Evan Sia Wai Suan</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=waisuan" title="Code">💻</a></td>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	a1c5848a5e	Merge branch 'master' into all-contributors/add-waisuan # Conflicts: # .all-contributorsrc # README.md	2020-07-29 18:19:14 +03:00
allcontributors[bot]	e7200f5a37	docs: update .all-contributorsrc [skip ci]	2020-07-28 16:56:53 +00:00
allcontributors[bot]	7b23016a5f	docs: update README.md [skip ci]	2020-07-28 16:56:52 +00:00