Skip to content

Commit 7ee1839

Browse files
author
andela-vdugeri
committed
Rebase with changes on master branch
2 parents fd99026 + a9a3df1 commit 7ee1839

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
1212
## Installation
1313

14-
[PHP](https://php.net) 5.4+ or [HHVM](http://hhvm.com) 3.3+, and [Composer](https://getcomposer.org) are required.
14+
[PHP](https://php.net) 7 and [Composer](https://getcomposer.org) are required.
1515

1616
To get the latest version of Laravel Emoji, simply add the following line to the require block of your `composer.json` file.
1717

src/Emojis/emoji.php

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@
1313
|
1414
*/
1515

16+
"birthday" => "\u{1F382}",
17+
"running" => "\u{1F3C3}",
18+
"house" => "\u{1F3E0}",
19+
"office" => "\u{1F3E2}",
20+
"shit" => "\u{1F4A9}",
21+
"computer" => "\u{1F4BB}",
22+
"moneybag" => "\u{1F4B0}",
23+
"camera" => "\u{1F4F7}",
24+
"thumbsup" => "\u{1F44D}",
25+
"thumbsdown" => "\u{1F44E}",
26+
"family" => "\u{1F46A}",
27+
"kiss" => "\u{1F48B}",
28+
"gun" => "\u{1F52B}",
1629
"grinning" => "\u{1F600}",
1730
"grin" => "\u{1F601}",
1831
"joy" => "\u{1F602}",
@@ -63,5 +76,12 @@
6376
"raised_hands" => "\u{1F64C}",
6477
"person_frowning" => "\u{1F64D}",
6578
"pray" => "\u{1F64F}",
66-
"relaxed" => "\u{263A}"
79+
"worried" => "\u{1F61F}",
80+
"cry" => "\u{1F622}",
81+
"scream" => "\u{1F631}",
82+
"raised_hands" => "\u{1F64C}",
83+
"pray" => "\u{1F64F}",
84+
"relaxed" => "\u{263A}",
85+
"white_check_mark" => "\u{2705}",
86+
"question" => "\u{2753}"
6787
];

0 commit comments

Comments
 (0)