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

Fix pokemon to fix CI #139

Merged
merged 2 commits into from
Oct 22, 2017
Merged

Fix pokemon to fix CI #139

merged 2 commits into from
Oct 22, 2017

Conversation

hugovk
Copy link
Collaborator

@hugovk hugovk commented Oct 22, 2017

Update ditto link, and use HTTPS whilst we're at it.

@zachfeldman zachfeldman merged commit 6c7474d into lambtron:master Oct 22, 2017
@hugovk hugovk deleted the fix-pokemon branch October 22, 2017 19:07
@pbock
Copy link
Contributor

pbock commented Oct 22, 2017

Thanks for this, I didn't have time earlier.

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