Compare commits

...

7 Commits

Author SHA1 Message Date
Ilkka Seppälä
ae89ac1214 fix merge 2020-07-29 20:41:21 +03:00
Ilkka Seppälä
2aa0cf6c8f Merge branch 'master' into all-contributors/add-hbothra15
# Conflicts:
#	.all-contributorsrc
#	README.md
2020-07-29 20:31:33 +03:00
allcontributors[bot]
3675acfaa0
docs: update .all-contributorsrc [skip ci] 2020-07-29 17:25:53 +00:00
allcontributors[bot]
cab3ede446
docs: update README.md [skip ci] 2020-07-29 17:25:52 +00:00
Ilkka Seppälä
27c126ebf4 Merge branch 'master' into all-contributors/add-hbothra15
# Conflicts:
#	.all-contributorsrc
#	README.md
2020-07-29 18:01:37 +03:00
allcontributors[bot]
3553adb914
docs: update .all-contributorsrc [skip ci] 2020-07-28 16:52:08 +00:00
allcontributors[bot]
39be48d6e0
docs: update README.md [skip ci] 2020-07-28 16:52:07 +00:00
2 changed files with 4 additions and 2 deletions

View File

@ -747,7 +747,8 @@
"avatar_url": "https://avatars1.githubusercontent.com/u/7418012?v=4",
"profile": "https://github.com/hbothra15",
"contributions": [
"code"
"code",
"design"
]
},
{

View File

@ -114,7 +114,7 @@ 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://www.linkedin.com/in/pramodgupta3/"><img src="https://avatars1.githubusercontent.com/u/2184241?v=4" width="100px;" alt=""/><br /><sub><b>Pramod Gupta</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AIAmPramod" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://github.com/hbothra15"><img src="https://avatars1.githubusercontent.com/u/7418012?v=4" width="100px;" alt=""/><br /><sub><b>Hemant Bothra</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=hbothra15" title="Code">💻</a> <a href="#design-hbothra15" title="Design">🎨</a></td>
</tr>
<tr>
<td align="center"><a href="https://amarnath510.github.io/portfolio"><img src="https://avatars0.githubusercontent.com/u/4599623?v=4" width="100px;" alt=""/><br /><sub><b>Amarnath Chandana</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Amarnath510" title="Code">💻</a></td>
@ -237,6 +237,7 @@ This project is licensed under the terms of the MIT license.
<td align="center"><a href="https://zd-zero.github.io"><img src="https://avatars0.githubusercontent.com/u/21978370?v=4" width="100px;" alt=""/><br /><sub><b>Zaerald Denze Lungos</b></sub></a><br /><a href="#content-zd-zero" title="Content">🖋</a></td>
</tr>
<tr>
<td align="center"><a href="https://www.linkedin.com/in/pramodgupta3/"><img src="https://avatars1.githubusercontent.com/u/2184241?v=4" width="100px;" alt=""/><br /><sub><b>Pramod Gupta</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/pulls?q=is%3Apr+reviewed-by%3AIAmPramod" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://webpro.nl"><img src="https://avatars1.githubusercontent.com/u/456426?v=4" width="100px;" alt=""/><br /><sub><b>Lars Kappert</b></sub></a><br /><a href="#content-webpro" title="Content">🖋</a></td>
</tr>
</table>