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

# Conflicts: # .all-contributorsrc # README.md
docs: add anthonycampbell as a contributor (#1435 )
2020-07-29 19:39:21 +03:00 · 2020-07-29 19:38:23 +03:00 · 2020-07-28 17:10:49 +00:00 · 2020-07-28 17:10:48 +00:00
2 changed files with 10 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -291,6 +291,15 @@
        "code"
      ]
    },
+    {
+      "login": "amogozov",
+      "name": "Artur Mogozov",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7372215?v=4",
+      "profile": "https://github.com/amogozov",
+      "contributions": [
+        "code"
+      ]
+    },
    {
      "login": "anthonycampbell",
      "name": "anthony",
--- a/README.md
+++ b/README.md
@ -204,6 +204,7 @@ This project is licensed under the terms of the MIT license.
    <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>
    <td align="center"><a href="http://ccygnus.com/"><img src="https://avatars1.githubusercontent.com/u/9342724?v=4" width="100px;" alt=""/><br /><sub><b>Christian Cygnus</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=christophercolumbusdog" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/anthonycampbell"><img src="https://avatars3.githubusercontent.com/u/10249255?v=4" width="100px;" alt=""/><br /><sub><b>anthony</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=anthonycampbell" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/amogozov"><img src="https://avatars3.githubusercontent.com/u/7372215?v=4" width="100px;" alt=""/><br /><sub><b>Artur Mogozov</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=amogozov" title="Code">💻</a></td>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	e91c3a9ab2	Merge branch 'master' into all-contributors/add-amogozov # Conflicts: # .all-contributorsrc # README.md	2020-07-29 19:39:21 +03:00
allcontributors[bot]	e222a69964	docs: add anthonycampbell as a contributor (#1435 ) * 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:38:23 +03:00
allcontributors[bot]	eb0ffcaa0e	docs: update .all-contributorsrc [skip ci]	2020-07-28 17:10:49 +00:00
allcontributors[bot]	60ee3ca6e7	docs: update README.md [skip ci]	2020-07-28 17:10:48 +00:00