Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into all-contributors/add-Azureyjt
# Conflicts:
#	.all-contributorsrc
#	README.md
  • Loading branch information
iluwatar committed Jul 29, 2020
commit 51f71af60c90a496c24b1fa4a7f196818ff3e7e3
117 changes: 117 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,123 @@
"contributions": [
"code"
]
},
{
"login": "vehpsr",
"name": "gans",
"avatar_url": "https://avatars2.githubusercontent.com/u/3133265?v=4",
"profile": "https://github.com/vehpsr",
"contributions": [
"code"
]
},
{
"login": "ThatGuyWithTheHat",
"name": "Matt",
"avatar_url": "https://avatars0.githubusercontent.com/u/24470582?v=4",
"profile": "https://github.com/ThatGuyWithTheHat",
"contributions": [
"content"
]
},
{
"login": "gopinath-langote",
"name": "Gopinath Langote",
"avatar_url": "https://avatars2.githubusercontent.com/u/10210778?v=4",
"profile": "https://www.linkedin.com/in/gopinathlangote/",
"contributions": [
"code"
]
},
{
"login": "hoswey",
"name": "Hoswey",
"avatar_url": "https://avatars3.githubusercontent.com/u/3689445?v=4",
"profile": "https://github.com/hoswey",
"contributions": [
"code"
]
},
{
"login": "amit2103",
"name": "Amit Pandey",
"avatar_url": "https://avatars3.githubusercontent.com/u/7566692?v=4",
"profile": "https://github.com/amit2103",
"contributions": [
"code"
]
},
{
"login": "gwildor28",
"name": "gwildor28",
"avatar_url": "https://avatars0.githubusercontent.com/u/16000365?v=4",
"profile": "https://github.com/gwildor28",
"contributions": [
"content"
]
},
{
"login": "llitfkitfk",
"name": "田浩",
"avatar_url": "https://avatars1.githubusercontent.com/u/2404785?v=4",
"profile": "https://t.me/paul_docker",
"contributions": [
"content"
]
},
{
"login": "pitsios-s",
"name": "Stamatis Pitsios",
"avatar_url": "https://avatars1.githubusercontent.com/u/6773603?v=4",
"profile": "https://twitter.com/StPitsios",
"contributions": [
"code"
]
},
{
"login": "qza",
"name": "qza",
"avatar_url": "https://avatars3.githubusercontent.com/u/233149?v=4",
"profile": "https://github.com/qza",
"contributions": [
"code"
]
},
{
"login": "Tschis",
"name": "Rodolfo Forte",
"avatar_url": "https://avatars1.githubusercontent.com/u/20662669?v=4",
"profile": "http://tschis.github.io",
"contributions": [
"content"
]
},
{
"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",
"avatar_url": "https://avatars1.githubusercontent.com/u/9137432?v=4",
"profile": "https://github.com/robertt240",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 4,
Expand Down
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,27 @@ This project is licensed under the terms of the MIT license.
<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/Azureyjt"><img src="https://avatars2.githubusercontent.com/u/18476317?v=4" width="100px;" alt=""/><br /><sub><b>Azureyjt</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Azureyjt" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/qza"><img src="https://avatars3.githubusercontent.com/u/233149?v=4" width="100px;" alt=""/><br /><sub><b>qza</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=qza" title="Code">💻</a></td>
<td align="center"><a href="http://tschis.github.io"><img src="https://avatars1.githubusercontent.com/u/20662669?v=4" width="100px;" alt=""/><br /><sub><b>Rodolfo Forte</b></sub></a><br /><a href="#content-Tschis" title="Content">🖋</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>
</tr>
<tr>
<td align="center"><a href="https://twitter.com/StPitsios"><img src="https://avatars1.githubusercontent.com/u/6773603?v=4" width="100px;" alt=""/><br /><sub><b>Stamatis Pitsios</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=pitsios-s" 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>
<td align="center"><a href="https://t.me/paul_docker"><img src="https://avatars1.githubusercontent.com/u/2404785?v=4" width="100px;" alt=""/><br /><sub><b>田浩</b></sub></a><br /><a href="#content-llitfkitfk" title="Content">🖋</a></td>
<td align="center"><a href="https://github.com/gwildor28"><img src="https://avatars0.githubusercontent.com/u/16000365?v=4" width="100px;" alt=""/><br /><sub><b>gwildor28</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=gwildor28" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/amit2103"><img src="https://avatars3.githubusercontent.com/u/7566692?v=4" width="100px;" alt=""/><br /><sub><b>Amit Pandey</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=amit2103" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/hoswey"><img src="https://avatars3.githubusercontent.com/u/3689445?v=4" width="100px;" alt=""/><br /><sub><b>Hoswey</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=hoswey" title="Code">💻</a></td>
<td align="center"><a href="https://www.linkedin.com/in/gopinathlangote/"><img src="https://avatars2.githubusercontent.com/u/10210778?v=4" width="100px;" alt=""/><br /><sub><b>Gopinath Langote</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=gopinath-langote" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ThatGuyWithTheHat"><img src="https://avatars0.githubusercontent.com/u/24470582?v=4" width="100px;" alt=""/><br /><sub><b>Matt</b></sub></a><br /><a href="#content-ThatGuyWithTheHat" title="Content">🖋</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/vehpsr"><img src="https://avatars2.githubusercontent.com/u/3133265?v=4" width="100px;" alt=""/><br /><sub><b>gans</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=vehpsr" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-enable -->
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.