Skip to content

Commit 8200560

Browse files
authored
Merge branch 'master' into all-contributors/add-d-kad
2 parents beeb881 + 51e88db commit 8200560

2 files changed

Lines changed: 54 additions & 1 deletion

File tree

.all-contributorsrc

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,56 @@
88
"commitConvention": "angular",
99
"contributorsPerLine": 7,
1010
"contributors": [
11+
{
12+
"login": "tturocy",
13+
"name": "Ted Turocy",
14+
"avatar_url": "https://avatars.githubusercontent.com/u/180959?v=4",
15+
"profile": "https://github.com/tturocy",
16+
"contributions": [
17+
"code",
18+
"doc",
19+
"research",
20+
"maintenance",
21+
"ideas"
22+
]
23+
},
24+
{
25+
"login": "rahulsavani",
26+
"name": "Rahul Savani",
27+
"avatar_url": "https://avatars.githubusercontent.com/u/743139?v=4",
28+
"profile": "http://www.csc.liv.ac.uk/~rahul",
29+
"contributions": [
30+
"code",
31+
"doc",
32+
"research",
33+
"maintenance",
34+
"ideas"
35+
]
36+
},
37+
{
38+
"login": "edwardchalstrey1",
39+
"name": "Ed Chalstrey",
40+
"avatar_url": "https://avatars.githubusercontent.com/u/5486164?v=4",
41+
"profile": "https://edchalstrey.com/",
42+
"contributions": [
43+
"code",
44+
"doc",
45+
"tutorial"
46+
]
47+
},
48+
{
49+
"login": "StephenPasteris",
50+
"name": "StephenPasteris",
51+
"avatar_url": "https://avatars.githubusercontent.com/u/140617768?v=4",
52+
"profile": "https://github.com/StephenPasteris",
53+
"contributions": [
54+
"research",
55+
"code"
56+
]
57+
},
1158
{
1259
"login": "d-kad",
13-
"name": "Daniel ",
60+
"name": "Daniel Kadnikov",
1461
"avatar_url": "https://avatars.githubusercontent.com/u/165307096?v=4",
1562
"profile": "https://github.com/d-kad",
1663
"contributions": [

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@ installable via PyPI.
4444
<table>
4545
<tbody>
4646
<tr>
47+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tturocy"><img src="https://avatars.githubusercontent.com/u/180959?v=4?s=100" width="100px;" alt="Ted Turocy"/><br /><sub><b>Ted Turocy</b></sub></a><br /><a href="#code-tturocy" title="Code">💻</a> <a href="#doc-tturocy" title="Documentation">📖</a> <a href="#research-tturocy" title="Research">🔬</a> <a href="#maintenance-tturocy" title="Maintenance">🚧</a> <a href="#ideas-tturocy" title="Ideas, Planning, & Feedback">🤔</a></td>
48+
<td align="center" valign="top" width="14.28%"><a href="http://www.csc.liv.ac.uk/~rahul"><img src="https://avatars.githubusercontent.com/u/743139?v=4?s=100" width="100px;" alt="Rahul Savani"/><br /><sub><b>Rahul Savani</b></sub></a><br /><a href="#code-rahulsavani" title="Code">💻</a> <a href="#doc-rahulsavani" title="Documentation">📖</a> <a href="#research-rahulsavani" title="Research">🔬</a> <a href="#maintenance-rahulsavani" title="Maintenance">🚧</a> <a href="#ideas-rahulsavani" title="Ideas, Planning, & Feedback">🤔</a></td>
49+
</tr>
50+
<tr>
51+
<td align="center" valign="top" width="14.28%"><a href="https://edchalstrey.com/"><img src="https://avatars.githubusercontent.com/u/5486164?v=4?s=100" width="100px;" alt="Ed Chalstrey"/><br /><sub><b>Ed Chalstrey</b></sub></a><br /><a href="#code-edwardchalstrey1" title="Code">💻</a> <a href="#doc-edwardchalstrey1" title="Documentation">📖</a> <a href="#tutorial-edwardchalstrey1" title="Tutorials">✅</a></td>
4752
<td align="center" valign="top" width="14.28%"><a href="https://github.com/d-kad"><img src="https://avatars.githubusercontent.com/u/165307096?v=4?s=100" width="100px;" alt="Daniel "/><br /><sub><b>Daniel </b></sub></a><br /><a href="#research-d-kad" title="Research">🔬</a> <a href="#code-d-kad" title="Code">💻</a></td>
53+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/StephenPasteris"><img src="https://avatars.githubusercontent.com/u/140617768?v=4?s=100" width="100px;" alt="StephenPasteris"/><br /><sub><b>StephenPasteris</b></sub></a><br /><a href="#research-StephenPasteris" title="Research">🔬</a> <a href="#code-StephenPasteris" title="Code">💻</a></td>
4854
</tr>
4955
</tbody>
5056
</table>

0 commit comments

Comments
 (0)