Skip to content

Commit

Permalink
Merge branch 'master' into feat/commit-message-templates
Browse files Browse the repository at this point in the history
  • Loading branch information
delucis authored May 15, 2018
2 parents 98bb0a5 + 40494a4 commit 3285dbd
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 1,566 deletions.
21 changes: 20 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,8 @@
"avatar_url": "https://avatars2.githubusercontent.com/u/357379?v=4",
"profile": "http://chrisswithinbank.net/",
"contributions": [
"doc"
"doc",
"code"
]
},
{
Expand Down Expand Up @@ -918,6 +919,24 @@
"contributions": [
"plugin"
]
},
{
"login": "tedmiston",
"name": "Taylor D. Edmiston",
"avatar_url": "https://avatars3.githubusercontent.com/u/366688?v=4",
"profile": "http://blog.tedmiston.com/",
"contributions": [
"doc"
]
},
{
"login": "danielmahon",
"name": "Daniel Mahon",
"avatar_url": "https://avatars2.githubusercontent.com/u/1088089?v=4",
"profile": "https://www.mahonstudios.com",
"contributions": [
"code"
]
}
]
}
6 changes: 4 additions & 2 deletions README.md

Large diffs are not rendered by default.

Loading

0 comments on commit 3285dbd

Please sign in to comment.