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/267e.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/267e.svg')
-rw-r--r-- | public/emoji/267e.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/267e.svg b/public/emoji/267e.svg new file mode 100644 index 000000000..03df2a6a6 --- /dev/null +++ b/public/emoji/267e.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#3B94D9" cx="18" cy="18" r="18"/><path fill="#FFF" d="M25.565 11.295c-2.116 0-4.195 1.322-5.799 2.712.609.669 1.021 1.198 1.147 1.364.172.227.423.534.733.882 1.236-1.084 2.689-2.044 3.919-2.044 2.09 0 3.79 1.7 3.79 3.79s-1.7 3.79-3.79 3.79c-2.337 0-5.484-3.456-6.402-4.668-.45-.596-4.521-5.826-8.729-5.826-3.697 0-6.705 3.008-6.705 6.705s3.008 6.704 6.705 6.704c2.055 0 4.073-1.248 5.657-2.594-.67-.726-1.122-1.307-1.255-1.483-.151-.199-.366-.462-.624-.757-1.204 1.032-2.594 1.919-3.778 1.919-2.09 0-3.79-1.7-3.79-3.79s1.7-3.79 3.79-3.79c2.338 0 5.484 3.456 6.402 4.668.45.596 4.521 5.826 8.729 5.826 3.697 0 6.704-3.007 6.704-6.704.001-3.696-3.006-6.704-6.704-6.704z"/></svg> \ No newline at end of file |