Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Slackmoji prefixes #127

Merged
merged 14 commits into from
Aug 14, 2017
Merged

Add Slackmoji prefixes #127

merged 14 commits into from
Aug 14, 2017

Conversation

flamableconcrete
Copy link
Contributor

This should address #126. I'm not super happy that it rearranged some of the slackmoji numbering (e.g. :android: and :android2: had their URLs switched), but it was a minor inconvenience IMO.

@flamableconcrete
Copy link
Contributor Author

Based on the brief conversation in the #126 issue thread, this should be good to merge?

@zachfeldman
Copy link
Contributor

I will merge on Monday if no objections.

@zachfeldman zachfeldman merged commit b7d5ebb into lambtron:master Aug 14, 2017
camalot added a commit to bit13labs/emojipacks that referenced this pull request Feb 3, 2018
* 'master' of ssh://github.com/lambtron/emojipacks: (30 commits)
  Added export json conversion script to easily transfer emojis between slacks (lambtron#141)
  introducing pumpkinparrot and angelparrot (lambtron#140)
  CI: Only print summary if errors (lambtron#138)
  Add pack with German states' (Bundesländer) coats of arms (lambtron#137)
  Fix pokemon to fix CI (lambtron#139)
  five new parrots (lambtron#136)
  add luckyparrot and rotatingparrot (lambtron#133)
  Delete hipchat.yaml (lambtron#135)
  Update README.md with 2FA (lambtron#132)
  Added in ryangoslingparrot and tacoparrot (lambtron#131)
  Add Slackmoji prefixes (lambtron#127)
  added 11 new parrots (lambtron#128)
  Add Script to Update emojis from Slackmoji.com (lambtron#123)
  Updated file extension to fit with convention (lambtron#124)
  Add AWS Simple icons (lambtron#120)
  Update Finland pack with new emoji (lambtron#121)
  Revert "created an all emoji file (lambtron#118)" (lambtron#119)
  created an all emoji file (lambtron#118)
  Added prefix to occupy emoji. [lambtron#116] (lambtron#116)
  Adds Political Pack of Emojis (lambtron#115)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants