Skip to content

Commit 8be6edb

Browse files
authored
Merge branch 'master' into cs/externalResource
2 parents 73a039a + 13a6728 commit 8be6edb

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,15 @@
424424
"code",
425425
"bug"
426426
]
427+
},
428+
{
429+
"login": "garciadev",
430+
"name": "Daniel Garcia",
431+
"avatar_url": "https://avatars.githubusercontent.com/u/5198299?v=4",
432+
"profile": "https://github.com/garciadev",
433+
"contributions": [
434+
"bug"
435+
]
427436
}
428437
],
429438
"contributorsPerLine": 7,

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# THAT.US
22

33
[![GitHub issues open](https://img.shields.io/github/issues/thatconference/that.us.svg)](https://github.com/thatconference/that.us/issues) [![release](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/thatconference/that.us/issues) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
4-
[![All Contributors](https://img.shields.io/badge/all_contributors-45-orange.svg?style=flat-square)](#contributors-)
4+
[![All Contributors](https://img.shields.io/badge/all_contributors-46-orange.svg?style=flat-square)](#contributors-)
55
<!-- ALL-CONTRIBUTORS-BADGE:END -->
66

77
## Get started
@@ -124,6 +124,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
124124
<td align="center"><a href="https://github.com/AndrewSchwabe"><img src="https://avatars.githubusercontent.com/u/17070695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Schwabe</b></sub></a><br /><a href="https://github.com/ThatConference/that.us/commits?author=AndrewSchwabe" title="Code">💻</a></td>
125125
<td align="center"><a href="https://github.com/binaryjanitor"><img src="https://avatars.githubusercontent.com/u/13708049?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jon Cwiak</b></sub></a><br /><a href="https://github.com/ThatConference/that.us/issues?q=author%3Abinaryjanitor" title="Bug reports">🐛</a></td>
126126
<td align="center"><a href="https://code.erpenbeck.io"><img src="https://avatars.githubusercontent.com/u/8420128?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael</b></sub></a><br /><a href="https://github.com/ThatConference/that.us/commits?author=GitMje" title="Code">💻</a> <a href="https://github.com/ThatConference/that.us/issues?q=author%3AGitMje" title="Bug reports">🐛</a></td>
127+
<td align="center"><a href="https://github.com/garciadev"><img src="https://avatars.githubusercontent.com/u/5198299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Garcia</b></sub></a><br /><a href="https://github.com/ThatConference/that.us/issues?q=author%3Agarciadev" title="Bug reports">🐛</a></td>
127128
</tr>
128129
</table>
129130

0 commit comments

Comments
 (0)