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/1f9e9.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/1f9e9.svg')
| -rw-r--r-- | public/emoji/1f9e9.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9e9.svg b/public/emoji/1f9e9.svg new file mode 100644 index 000000000..5f1e0d05c --- /dev/null +++ b/public/emoji/1f9e9.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#50A5E6" d="M34.981 26.637c-.425-.479-1.038-.732-1.773-.732-.789 0-1.313.347-1.82.682-.562.371-1.643 1.255-2.743 1.255-1.952 0-3.562-2.167-3.562-4.75s1.031-4.688 3-4.688c1.209 0 2.157 1.121 2.773 1.448.473.252.919.489 1.477.489 1.232 0 2.217-1.03 2.372-2.507.201-1.909-.371-7.584-.451-8.153-.105-.751-.792-1.181-1.576-1.127-1.2.082-8.114.236-8.337.236-2.263 0-2.592-1.03-2.075-2.675.078-.247.257-.649.257-1.5 0-2.499-2.025-4.524-4.524-4.524s-4.524 2.025-4.524 4.524c0 .852.18 1.254.257 1.5.518 1.645.188 2.675-2.075 2.675-.223 0-7.137-.153-8.337-.236-.782-.054-1.469.376-1.575 1.129-.08.569-.651 6.243-.451 8.153.155 1.477 1.14 2.507 2.372 2.507.558 0 1.004-.237 1.477-.489.616-.327 1.564-1.448 2.773-1.448 1.969 0 3 2.104 3 4.688s-1.61 4.75-3.562 4.75c-1.1 0-2.181-.884-2.743-1.255-.507-.335-1.031-.682-1.82-.682-.735 0-1.348.253-1.773.732-.518.583-.725 1.453-.598 2.514.188 1.563.702 5.495.702 5.495.153 1.059.765 1.294 1.518 1.259.011-.001 11.732-.814 15.36-.814s15.349.813 15.361.814c.753.035 1.365-.2 1.518-1.259 0 0 .514-3.932.702-5.495.126-1.061-.081-1.931-.6-2.516z"/></svg> \ No newline at end of file |