Skip to content

Commit

Permalink
Merge branch 'master' into ios12-animals
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonrudolph authored Nov 17, 2018
2 parents a10fd50 + 9d6df62 commit 242fe68
Show file tree
Hide file tree
Showing 4 changed files with 422 additions and 16 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Thanks for thinking about contributing to this project. :heart_eyes:
:x: `'a'`<br>
:o: `"a"`

- A space follwing comma and colon:<br>
- A space following comma and colon:<br>
:x: `"horse":["animal","unicorn"],`<br>
:o: `"horse": ["animal", "unicorn"],`

## Commiting, sending the pull request
## Committing, sending the pull request

- It's preferred that when adding a keyword to one specific emoji, you use that emoji or a relevant emoji as the commit message. For example: [`2a34a84`](https://github.com/muan/emojilib/commit/2a34a84576ec1565587bb78ff465844c835819ad)

Expand Down
Loading

0 comments on commit 242fe68

Please sign in to comment.