diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
tree | a8a0df2129a863a739dda6399352d64af811110e /public/emoji/1f93e.svg | |
parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'public/emoji/1f93e.svg')
-rw-r--r-- | public/emoji/1f93e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f93e.svg b/public/emoji/1f93e.svg index f1a18f046..28e86b3ef 100644 --- a/public/emoji/1f93e.svg +++ b/public/emoji/1f93e.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#FFDC5D" cx="18.625" cy="5" rx="2.625" ry="3"/><path fill="#FFAC33" d="M15.63 3.212s.193-1.038-1.258-1.158c-1.196-.099-1.513 1.208-2.378 1.675-.653.352-1.4.364-1.921.013 0 0 .716.867 1.52 1.198 1.045.43 2.333.154 2.947-.175.96-.515 1.09-1.553 1.09-1.553z"/><path fill="#DD2E44" d="M17.967 33.355c-.552 0-1-.447-1-1v-3c0-.553.448-1 1-1s1 .447 1 1v3c0 .553-.448 1-1 1zm-9.431 1.076c-.199.094-.43.123-.661.067-.537-.13-.866-.671-.736-1.208l.669-2.76c.13-.535.669-.866 1.207-.736.537.13.866.671.736 1.208l-.669 2.76c-.074.306-.281.544-.546.669z"/><path fill="#FFDC5D" d="M19.73 9.107l-.457-3.933c-.061-.549-.574-.973-1.117-.908-.549.061-.951.543-.889 1.092l.4 3.642h-4.584L7.228 6.106c-.55-.091-1.06.278-1.151.822-.091.545.277 1.06.822 1.151l5.389 2.787c.054.01.657.134.712.134h2.749c.009.262.086.588.251 1 1 2.5 3 8 3 8 2.209 0 2.625-4.723 2.625-7.208 0-.604.299-.753.197-1.101 1.171-.152 1.334.359 1.874.487 0 0-1.799-3.26-3.966-3.071z"/><path fill="#FFDC5D" d="M14.177 26.122c-.456-.402-.56-1.088-.216-1.612l4.817-7.347c.376-.574 1.147-.735 1.72-.359.571.382.734 1.147.358 1.72l-4.817 7.347c-.376.574-1.147.735-1.72.359-.052-.032-.098-.069-.142-.108z"/><path fill="#FFDC5D" d="M8.628 31.08c-.308-.458-.268-1.066.116-1.42l5.382-4.971c.42-.389 1.094-.325 1.505.142.407.471.403 1.161-.018 1.549l-5.382 4.971c-.42.388-1.095.325-1.505-.142-.036-.042-.068-.085-.098-.129zm8.861-1.75c-.184-.479-.029-1.019.384-1.257l5.786-3.347c.452-.262 1.041-.062 1.315.447.271.511.131 1.133-.322 1.394l-5.786 3.347c-.452.261-1.041.061-1.315-.447-.024-.045-.044-.09-.062-.137z"/><path fill="#FFDC5D" d="M24.304 26.637c-.533.185-1.136-.044-1.403-.561l-3.745-7.25c-.293-.566-.071-1.263.495-1.555.569-.288 1.263-.071 1.555.496l3.745 7.25c.293.566.071 1.263-.495 1.555-.05.026-.1.047-.152.065zm0-13.611l-3.85-2.008c-.457-.238-.636-.807-.398-1.264.238-.457.807-.636 1.264-.397l3.85 2.008c.457.238.636.807.398 1.264-.238.457-.807.636-1.264.397z"/><path fill="#FFDC5D" d="M30.07 13.88l-5.302-.783c-.51-.075-.865-.554-.79-1.064.075-.51.554-.865 1.064-.79l5.302.783c.51.075.865.554.79 1.064-.075.51-.554.865-1.064.79z"/><path fill="#FFAC33" d="M21.25 5s.283-.678.479-1.333c.225-.75-.542-1.855-1.438-2.479-.699-.487-2.461-.66-3.656-.029-1.349.713-1.687 2.024-1.462 3.373.207 1.24 1.349 2.324 1.349 2.324s.414-1.064.227-1.085c-.347-.039-.555-1.105-.264-1.389.306-.299.6 0 .675.3.075.3.277 1.151.277 1.151s-.052-1.076.248-1.414c.3-.337 1.724-.262 2.324-1.724 0 0 .47.179.845.742.309.464.396 1.563.396 1.563z"/><path fill="#A0041E" d="M16.5 17.957s-.803 2.028-1.071 2.869c-.268.842-.825 1.799-.825 1.799s1.694 1.477 2.995 1.438l1.885-2.74 1.674 2.359s1.708-1.229 2.884-1.433c0 0-1.497-3.069-1.841-3.719-.344-.65-1.186-1.492-1.186-1.492l-4.515.919z"/><path fill="#DD2E44" d="M15.549 8.805s1.274.075 1.799.112c0 0 .075.825 1.349.862 1.274.037 1.612-.637 1.612-.637s.975.075 1.687.525c.712.45 1.799.975 1.799.975s-1.012.862-.637 1.799l-1.012-.483s.3.671.188 1.083c-.112.412-.479.75-.521 1.125-.116 1.044.329 3.892.479 4.229 0 0-1.292-.333-3.188-.125-1.16.128-3.125.958-3.125.958.021-.812.589-2.827.729-3.896.137-1.041-.785-3.942-1.422-4.092-.637-.15-1.125-.187-1.125-.187s.15-.675 0-1.199c-.15-.525-.225-.9-.225-.9s1.163-.074 1.613-.149z"/><circle fill="#269" cx="5" cy="8" r="2"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M28.65 31.29c.257.905.272 1.425.428 2.365.115.69.588 1.466 1.158 1.343.452-.097.795-.538.68-1.52-.061-.525-.205-.877-.393-1.416-.108-.311-.264-.74-.353-1.153-.097-.45-.438-.928-1.018-.802-.43.091-.674.58-.502 1.183z"/><path fill="#A0041E" d="M29.941 31.084c-.024-.017-.237-.141-.55-.054s-.425.267-.44.293c-.014.027.289.776.332.985.044.223.205.849.212.876.013.054.069.086.125.072l.597-.144c.056-.014.09-.068.077-.122l-.205-.845c-.058-.235-.123-1.044-.148-1.061z"/><path fill="#CCD6DD" d="M29.384 33.14c.016 0 .031-.002.047-.006l.91-.22c.107-.026.174-.134.147-.241-.026-.107-.134-.173-.241-.147l-.91.22c-.107.026-.174.134-.147.241.023.091.104.153.194.153zm-.174-.72c.016 0 .031-.002.047-.006l.91-.22c.107-.026.174-.134.147-.241-.025-.107-.135-.174-.241-.147l-.91.22c-.107.026-.174.134-.147.241.022.092.103.153.194.153zm-.174-.72c.016 0 .031-.002.047-.006l.91-.22c.107-.026.174-.134.147-.241s-.134-.174-.241-.147l-.91.22c-.107.026-.174.134-.147.241.022.092.103.153.194.153z"/><path fill="#DD2E44" d="M21.133 30.401c.18.923.402 1.394.688 2.302.21.667.139 1.573-.425 1.722-.447.118-.953-.12-1.294-1.047-.183-.496-.214-.875-.291-1.441-.044-.326-.1-.78-.207-1.188-.117-.445-.029-1.025.545-1.176.425-.113.864.213.984.828z"/><path fill="#A0041E" d="M20.862 30.571c-.024-.017-.24-.136-.551-.043-.311.094-.42.275-.434.302-.013.027.304.77.351.978.049.222.221.845.229.871.014.054.071.084.126.07l.594-.156c.056-.015.089-.07.075-.124l-.221-.841c-.062-.233-.144-1.041-.169-1.057z"/><path fill="#CCD6DD" d="M20.342 32.637c.017 0 .034-.002.051-.007l.905-.239c.107-.028.171-.137.143-.244-.027-.106-.137-.172-.244-.142l-.905.239c-.107.028-.171.137-.143.244.024.089.105.149.193.149zm-.188-.716c.017 0 .034-.002.051-.007l.905-.239c.107-.028.171-.137.143-.244-.027-.106-.138-.172-.244-.142l-.905.239c-.107.028-.171.137-.143.244.023.089.104.149.193.149zm-.189-.716c.017 0 .034-.002.051-.007l.905-.239c.107-.028.171-.137.143-.244-.028-.106-.139-.173-.244-.142l-.905.239c-.107.028-.171.137-.143.244.024.089.105.149.193.149z"/><g fill="#FFDC5D"><path d="M19.958 24.146l2.5-1.438 1.281 2.614c.24.185.28.276 1.615 1.052 1.203.699 3.46 3.091 4.21 4.025.213.198.259.341.393.701l-1.023.266s-.182-.34-.476-.533c-1.438-.821-6.309-3.495-6.309-3.495-.394-.283-.64-.478-.78-.72 0 0-1.192-1.979-1.411-2.472zm-6.037-2.159l2.501 1.313c-.171.271-.513.854-.797 1.59-.083.213-.191.618.163.874.2.146.59.466.889.704.204.163.438.349.714.563.997.778 3.032 2.787 3.198 2.951.166.164.283.377.344.662-.087.019-.965.233-.965.233s-.123-.307-.421-.487c-.929-.561-6.214-3.599-6.214-3.599-.69-.495-1.067-.722-1.005-1.432.107-1.24 1.263-2.915 1.593-3.372zm8.503-12.665c.268-.28.705-.422 1.299-.422 1.689 0 3.358.215 3.783.3.118.023.173.024.301-.052.318-.188.435-.697.583-1.341.049-.217.102-.445.165-.672.279-1.001.588-2.46.55-2.736-.053-.384.312-3.219.356-3.262.071-.07.274.067.413.075.111.007.19.098.308.176.682.447.78 1.376.849 2 .042.386-.62 1.095-.684 1.502-.021.133-.048.804-.09 1.888-.044 1.135-.099 2.549-.141 2.788-.101.572-.208 1.186-1.01 1.382-.604.147-2.378.241-3.673.309-.65.035-1.213.064-1.512.093-.647.062-1.198-.058-1.515-.331-.192-.167-.296-.389-.309-.66-.016-.443.092-.793.327-1.037zM2.393 12.423c.285-.016.335-.059.612-.053.406.009.393.056.577.053.399-.006.967-.034 1.387-.084.31-.037 1.968-.116 2.419-.198.614-.113 1.384-.261 2.798-.152.794-.409 1.869-.87 2.823-1.279.699-.3 1.359-.583 1.802-.8.223-.109.442-.165.652-.165.156 0 .308.031.449.092.325.141.568.43.686.813.043.142.162.638-.108 1.073-.216.347-.624.573-1.214.671-.618.102-1.367.333-2.234.6-.857.265-1.82.561-2.804.772 0 0-1.555-.164-2.367-.213-1.124-.068-2.682-.362-3.092-.238-.518.157-1.068.303-1.715-.03-1.106-.569-2.212-.236-2.095-.707.027-.109.881-.125 1.424-.155zm15.779-7.43c.062-.564.59-1 1.148-.934.564.062.977.558.914 1.122l-.411 3.61.355.047s.363 1.057-1.449 1.057-1.621-.825-1.621-.825l.595-.113.469-3.964z"/><ellipse cx="18.833" cy="4.917" rx="2.625" ry="3"/></g><path fill="#FFAC33" d="M17.166 1.104c.699-.487 2.461-.66 3.656-.029.615.325 1.011.778 1.248 1.298.181-.193.487-.359 1.016-.403 1.196-.099 1.513 1.208 2.378 1.675.653.352 1.4.364 1.921.013 0 0-.716.867-1.52 1.198-1.045.43-2.333.154-2.947-.175-.258-.138-.452-.314-.604-.498-.01.089-.015.177-.03.266-.207 1.24-1.349 2.324-1.349 2.324s-.414-1.064-.227-1.085c.347-.039.555-1.105.264-1.389-.306-.299-.6 0-.675.3S20.02 5.75 20.02 5.75s.052-1.076-.248-1.414c-.3-.337-1.724-.262-2.324-1.724 0 0-.47.179-.845.742-.309.464-.396 1.562-.396 1.562s-.283-.678-.479-1.333c-.224-.749.543-1.855 1.438-2.479z"/><g fill="#A0041E"><path d="M20.896 18.375c.318 1.396 2.009 4.729 2.009 4.729s-1.639 1.477-2.987 1.437L17.963 21.7l-1.735 2.446s-1.713-1.274-2.931-1.485c0 0 1.666-3.182 2.023-3.856.357-.674 1.057-1.547 1.057-1.547s4.271.028 4.519 1.117z"/><path d="M19.815 24.612l-1.853-2.693-1.632 2.3c-.02.027-.049.046-.082.051-.032.004-.066-.003-.094-.022-.018-.013-1.703-1.259-2.879-1.463-.039-.007-.073-.032-.091-.067-.018-.036-.017-.078.002-.113 0 0 1.666-3.183 2.022-3.857.358-.676 1.042-1.53 1.07-1.566.023-.03.06-.047.098-.047h.001c.447.003 4.377.062 4.64 1.214.31 1.365 1.981 4.667 1.998 4.7.026.051.014.111-.028.149-.067.061-1.646 1.471-3.016 1.471-.058-.001-.123-.008-.156-.057zm.959-6.209c-.163-.714-2.72-1.001-4.336-1.019-.149.19-.707.912-1.008 1.479-.311.587-1.613 3.076-1.945 3.709 1.05.248 2.342 1.132 2.715 1.398l1.662-2.343c.023-.033.062-.053.102-.053h.001c.041 0 .079.021.102.054l1.918 2.788c1.115-.008 2.444-1.073 2.765-1.345-.275-.545-1.684-3.383-1.976-4.668z"/></g><path fill="#DD2E44" d="M22.043 8.722c-.549-.02-1.321.078-1.865.117 0 0-.078.855-1.399.894-1.321.039-1.671-.661-1.671-.661s-1.01.078-1.749.544c-.738.466-1.865.884-1.865.884s1.049 1.197.661 2.169l1.049-.315s-.352.593-.235 1.021c.117.427.538.88.581 1.269.12 1.082-.227 3.672-.383 4.021 0 0 1.225-.346 3.191-.13 1.202.133 3.042.965 3.042.965-.022-.842-.413-2.902-.559-4.01-.142-1.079.814-3.793 1.474-3.948.661-.155 1.166-.194 1.166-.194s-.155-.994 0-1.538.233-.933.233-.933-1.121-.135-1.671-.155z"/><circle fill="#269" cx="28.5" cy="2.917" r="2.055"/><path fill="#FFDC5D" d="M29.282 1.82l.079-.014c-.134.021-.261-.069-.284-.203-.023-.135.068-.265.204-.289l.513-.092.825.901.25.922-.817.15c-.135.023-.265-.068-.288-.204-.022-.129.064-.248.189-.279l-.22.038c-.135.023-.265-.068-.288-.204-.023-.131.065-.253.194-.282l-.271.046c-.135.023-.265-.068-.288-.204s.066-.263.202-.286z"/></svg> \ No newline at end of file |