Skip to content

Commit

Permalink
Merge pull request muan#25 from scotthso/gh-pages
Browse files Browse the repository at this point in the history
Update emojis.json
  • Loading branch information
muan committed May 9, 2014
2 parents 30a7a24 + 9e255d0 commit 40183d2
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions emojis.json
Original file line number Diff line number Diff line change
Expand Up @@ -556,32 +556,32 @@
"tomato": ["fruit", "vegetable", "nature", "food"],
"bicyclist": ["sports", "bike", "exercise", "hipster"],
"dvd": ["cd"],
"large_blue_diamond": [],
"large_blue_diamond": ["shape"],
"bike": ["sports", "bicycle", "exercise", "hipster"],
"e-mail": ["communication", "inbox"],
"large_orange_diamond": [],
"large_orange_diamond": ["shape"],
"top": ["words", "blue-square"],
"pushpin": ["stationery"],
"tractor": ["vehicle", "car", "farming", "agriculture"],
"birthday": ["party"],
"laughing": ["happy", "joy", "lol"],
"put_litter_in_its_place": ["blue-square"],
"traffic_light": ["traffic", "transportation"],
"black_circle": [],
"black_circle": ["shape"],
"question": ["doubt", "confused"],
"train": ["transportation"],
"black_joker": ["poker", "cards", "game"],
"ledger": ["notes"],
"train2": ["transportation", "vehicle"],
"black_large_square": [],
"black_large_square": ["shape"],
"egg": ["food"],
"left_luggage": ["blue-square", "travel"],
"tram": ["transportation", "vehicle"],
"black_medium_small_square": [],
"eggplant": ["vegetable", "nature", "food"],
"left_right_arrow": [],
"left_right_arrow": ["shape"],
"triangular_flag_on_post": [],
"black_medium_square": [],
"black_medium_square": ["shape"],
"eight": ["8", "blue-square", "numbers"],
"leftwards_arrow_with_hook": [],
"radio": ["communication", "music", "podcast", "program"],
Expand Down Expand Up @@ -804,7 +804,7 @@
"white_check_mark": ["green-square", "ok", "agree"],
"circus_tent": ["festival", "carnival", "party"],
"gift": ["present", "birthday", "christmas", "xmas"],
"white_circle": [],
"white_circle": ["shape"],
"city_sunrise": ["photo"],
"gift_heart": ["love", "valentines"],
"name_badge": ["fire"],
Expand All @@ -820,11 +820,11 @@
"white_medium_square": [],
"clapper": ["movie", "film", "record"],
"goberserk": ["ghonly"],
"white_small_square": [],
"white_small_square": ["shape"],
"clipboard": ["stationery", "documents"],
"godmode": ["ghonly"],
"new": ["blue-square"],
"white_square_button": [],
"white_square_button": ["shape"],
"clock1": ["time", "clock"],
"golf": ["sports"],
"shower": ["clean", "bath"],
Expand Down Expand Up @@ -857,19 +857,19 @@
"no_entry_sign": [],
"slot_machine": ["bet", "gamble", "vegas"],
"clock230": ["time", "clock"],
"small_blue_diamond": [],
"small_blue_diamond": ["shape"],
"wrench": ["tools"],
"clock3": ["time", "clock"],
"no_mobile_phones": ["iphone", "mute"],
"small_orange_diamond": [],
"small_orange_diamond": ["shape"],
"x": ["no", "delete", "remove"],
"clock330": ["time", "clock"],
"guitar": ["music", "instrument"],
"small_red_triangle": ["shape"],
"clock4": ["time", "clock"],
"gun": ["violence", "weapon"],
"no_pedestrians": ["limit"],
"small_red_triangle_down": [],
"small_red_triangle_down": ["shape"],
"yen": ["money", "japanese", "dollar"],
"clock430": ["time", "clock"],
"no_smoking": ["cigarette"],
Expand Down

0 comments on commit 40183d2

Please sign in to comment.