Skip to content

Commit

Permalink
Merge branch 'develop' into feature/decorator-repeat-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ashblue authored Jun 1, 2020
2 parents 3d8bcf6 + e51edfb commit 3bebad6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
"contributions": [
"bug"
]
},
{
"login": "call-stack",
"name": "call-stack",
"avatar_url": "https://avatars1.githubusercontent.com/u/38575304?v=4",
"profile": "https://github.com/call-stack",
"contributions": [
"bug"
]
}
],
"contributorsPerLine": 7,
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://jesse.tg"><img src="https://avatars0.githubusercontent.com/u/1175189?v=4" width="100px;" alt=""/><br /><sub><b>Jesse Talavera-Greenberg</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/commits?author=JesseTG" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/PureSaltProductions"><img src="https://avatars1.githubusercontent.com/u/52610924?v=4" width="100px;" alt=""/><br /><sub><b>PureSaltProductions</b></sub></a><br /><a href="#userTesting-PureSaltProductions" title="User Testing">📓</a></td>
<td align="center"><a href="https://github.com/mduvergey"><img src="https://avatars2.githubusercontent.com/u/18513379?v=4" width="100px;" alt=""/><br /><sub><b>Martin Duvergey</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/issues?q=author%3Amduvergey" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/call-stack"><img src="https://avatars1.githubusercontent.com/u/38575304?v=4" width="100px;" alt=""/><br /><sub><b>call-stack</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/issues?q=author%3Acall-stack" title="Bug reports">🐛</a></td>
</tr>
</table>

Expand Down

0 comments on commit 3bebad6

Please sign in to comment.