diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f9ff.svg | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/1f9ff.svg')
| -rw-r--r-- | public/emoji/1f9ff.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9ff.svg b/public/emoji/1f9ff.svg new file mode 100644 index 000000000..a45a528f4 --- /dev/null +++ b/public/emoji/1f9ff.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#1213BD" d="M36 18.302c0 4.981-2.46 9.198-5.655 12.462s-7.323 5.152-12.199 5.152-9.764-1.112-12.959-4.376S0 23.283 0 18.302s2.574-9.38 5.769-12.644S13.271 0 18.146 0s9.394 2.178 12.589 5.442C33.931 8.706 36 13.322 36 18.302z"/><path fill="#FFF" d="M29.994 18c0 3.314-1.092 6.559-3.264 8.73s-5.417 2.798-8.73 2.798-6.089-1.096-8.261-3.267S6.312 21.314 6.312 18s.9-6.445 3.071-8.617S14.686 5.608 18 5.608s6.203 1.846 8.375 4.017 3.619 5.061 3.619 8.375z"/><path fill="#88C9F9" d="M25.871 18c0 4.418-3.453 8.112-7.871 8.112S10.261 22.418 10.261 18s3.321-7.785 7.739-7.785 7.871 3.367 7.871 7.785z"/><path fill="#292F33" d="M23.075 17.825c0 2.665-2.235 4.908-4.9 4.908s-4.732-2.243-4.732-4.908 2.067-4.835 4.732-4.835 4.9 2.17 4.9 4.835z"/></svg> \ No newline at end of file |