about summary refs log tree commit diff
path: root/public/emoji/1f3c4-200d-2640-fe0f.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-11-20 15:36:09 +0100
committerThibaut Girka <thib@sitedethib.com>2019-11-20 15:36:09 +0100
commitff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch)
treea8a0df2129a863a739dda6399352d64af811110e /public/emoji/1f3c4-200d-2640-fe0f.svg
parent707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff)
parent8dfc45f757ed8995be0d16e88a1f1d6514dae677 (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/1f3c4-200d-2640-fe0f.svg')
-rw-r--r--public/emoji/1f3c4-200d-2640-fe0f.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3c4-200d-2640-fe0f.svg b/public/emoji/1f3c4-200d-2640-fe0f.svg
index cfa17057a..c33ecc72f 100644
--- a/public/emoji/1f3c4-200d-2640-fe0f.svg
+++ b/public/emoji/1f3c4-200d-2640-fe0f.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M36 5v27s0 4-4 4H4c-4 0-4-4-4-4v-5s25-2 36-22z"/><path fill="#E0245E" d="M30.59 20.432s2.33-2.136 1.924-3.049c-.408-.914-11.676.831-17.154 3.276-8.22 3.669-12.068 9.767-11.253 11.593.815 1.826 7.925 3.033 16.143-.635 5.48-2.445 14.301-9.669 13.895-10.582-.409-.913-3.555-.603-3.555-.603z"/><path fill="#F5F8FA" d="M34.145 21.035c-.408-.913-3.555-.604-3.555-.604s2.204-2.024 1.942-2.973L4.612 29.674c-.569 1.116-.747 2.037-.505 2.578.211.473.849.9 1.812 1.217l28.215-12.345c0-.027.02-.068.011-.089z"/><path fill="#FFDC5D" d="M24.408 15c-3.401 0-6.462-3.95-6.8-4.4-.332-.441-.242-1.067.199-1.399.441-.331 1.066-.244 1.4.198.754 1.002 3.158 3.601 5.2 3.601.553 0 1 .448 1 1s-.446 1-.999 1zm-17 4c-.419 0-.809-.265-.949-.684-1.195-3.584.152-5.934 1.492-7.273 1.401-1.401 3.07-1.968 3.141-1.992.525-.176 1.091.109 1.265.632.174.523-.107 1.088-.629 1.264-.516.176-4.996 1.861-3.371 6.736.175.524-.108 1.091-.632 1.265-.105.035-.212.052-.317.052z"/><path fill="#67757F" d="M25.406 26c-.3 0-.605-.067-.893-.211l-2-1c-.439-.22-.78-.592-.963-1.046l-1.682-4.204-4.204-1.682c-1.025-.41-1.524-1.574-1.114-2.6.41-1.026 1.576-1.525 2.6-1.114l5.001 2c.508.203.91.606 1.114 1.114l1.717 4.294 1.32.66c.988.494 1.389 1.695.895 2.684-.35.701-1.056 1.105-1.791 1.105z"/><path fill="#67757F" d="M16.409 30c-.733.001-1.44-.404-1.791-1.105l-1-2c-.199-.397-.259-.851-.172-1.287l.848-4.241-2.602-4.337c-.568-.947-.261-2.175.686-2.744.946-.569 2.175-.261 2.744.686l3 4.999c.256.427.344.934.246 1.422l-.865 4.327.693 1.386c.494.988.093 2.189-.895 2.684-.286.143-.591.21-.892.21z"/><path fill="#FFDC5D" d="M14.656.74c-1.684-.634-4.281.255-4.555 2.215-.272 1.947.326 4.985 2.029 4.775 1.786-.22 3.615-.636 4.312-2.489.697-1.851-.102-3.867-1.786-4.501z"/><path fill="#FFDC5D" d="M16.002 5.776c2.442-2.869-3.441-2.589-3.441-2.589-1.113.04-.347 1.895-.871 2.908-.359.701 1.153 1.073 1.153 1.073s.694-.01.732.832v.008c.008.214-.014.469-.114.81-.498 1.686 1.766 2.72 2.264 1.03.197-.669.12-1.257.021-1.799L15.736 8c-.151-.807-.338-1.514.266-2.224z"/><path fill="#67757F" d="M18.408 8h-2.672l-.751.766L13.56 8h-2.152c-1.104 0-2 .896-2 2s.896 2 2 2v3.5c0 1.933 1.567 3.5 3.5 3.5s3.5-1.567 3.5-3.5V12c1.104 0 2-.896 2-2s-.895-2-2-2z"/><path fill="#FFAC33" d="M16.578 1.387C16.087.83 15.513.43 14.816.225c-.914-.268-2.022-.133-3.525.409-1.381.499-1.63 2.049-1.29 2.396.039.019.065.057.108.07.027.008.052.005.079.011.588.13 1.129-.284 1.804-.194.315.042.657.186 1.052.571.061.059.101.149.134.248.162.489.038 1.336.038 1.336s.272-.934.39-1.256c.11-.3.513-.569.799.001.248.495-.151 1.222-.422 1.235-.209.01-.029.565.352 1.057.5.645 1.086.786 1.374.815.112.011.534.139 1.122-1.061.588-1.2.874-3.197-.253-4.476z"/><path fill="#FFAC33" d="M21.434 4.53c-1.209-.351-1.959-1.902-3.429-1.454-1.783.543-1.261 1.789-1.261 1.789s.443 1.264 1.783 1.648c.858.246 2.544.243 3.736-.577.917-.631 1.578-1.909 1.578-1.909-.557.58-1.494.767-2.407.503z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M36 5v27s0 4-4 4H4c-4 0-4-4-4-4v-5s25-2 36-22z"/><path fill="#1C6399" d="M31.844 23.243s2.565-1.635 2.258-2.288c-.309-.654-11.778.99-17.528 2.954-8.627 2.947-13.144 7.522-12.526 8.828.617 1.306 7.602 1.953 16.228-.993 5.752-1.964 15.368-7.524 15.06-8.177-.309-.653-3.492-.324-3.492-.324z"/><path fill="#A6D388" d="M31.474 22.747s2.65-1.619 2.349-2.291c-.303-.673-12.042.782-17.949 2.675C7.01 25.972 2.311 30.555 2.916 31.9c.605 1.345 7.723 2.141 16.585-.699 5.91-1.893 15.833-7.383 15.532-8.055-.303-.673-3.559-.399-3.559-.399z"/><path fill="#F5F8FA" d="M31.474 22.747s2.507-1.534 2.358-2.235L3.756 29.978c-.722.837-1.019 1.523-.84 1.922.156.348.755.657 1.7.878l30.395-9.566c.003-.02.029-.051.022-.066-.303-.673-3.559-.399-3.559-.399z"/><path fill="#FFDC5D" d="M27.755 12.233c-.589-.235-1.348-.276-2.104-.386-1.198-.175-2.852-.765-3.529-1.086-.825-.495-2.577-1.661-3.012-1.948S18.093 8.128 17.375 8h-.156c.385.542.609 1.159.748 2.841 0 0 3.319 1.661 3.595 1.753 1.125.375 3.182.366 4.344.512.602.076 1.021-.014 1.499-.047.722-.049 1.38-.055 1.422-.371.05-.367-.595-.265-1.072-.455zM14.698.997c-1.593-.627-4.077.182-4.365 2.043-.287 1.848.239 4.747 1.863 4.572 1.702-.184 3.448-.554 4.138-2.307.69-1.752-.043-3.681-1.636-4.308z"/><path fill="#FFDC5D" d="M15.882 5.757c2.318-2.723-3.266-2.458-3.266-2.458-1.057.038-.329 1.799-.827 2.761-.341.665 1.095 1.018 1.095 1.018s.659-.01.694.79v.007c.008.204-.013.445-.108.769-.473 1.601 1.677 2.582 2.149.978.187-.635.114-1.193.02-1.708l-.009-.046c-.144-.766-.322-1.438.252-2.111zm-4.883 2.645c-1.666.993-3.368 3.049-3.98 3.914-.36.283-.686.614-.897.736-.389.223-2.154 1.432-3.334 2.005-.354.166-1.458.438-1.992.781-.432.278-.845.262-.727.612.102.302.508.216 1.227.132.719-.084 1.929-.289 2.325-.566.8-.531 3.347-1.156 4.597-2.031.221-.155 2.385-2.163 2.781-2.741.543-1.515.282-2.556 0-2.842z"/><path fill="#FFAC33" d="M16.518 1.64C15.457.398 13.998-.117 11.499.849c-2.183.844-1.481 2.579-.972 2.282 1.869-1.09 2.899.514 3.697 2.269.523 1.151 1.56 1.502 1.56 1.502s.337.132.912-1.001.876-3.028-.178-4.261z"/><path fill="#FFDC5D" d="M16.261 28.432c-.378-.1-.67-.432-.807-.785-.059-.152-.365-1.001-.365-1.001H13.27c.043.214-.037.696-.134 1.197-.062.322-.114.892-.013 1.093.101.201.817.74 1.301.839 1.237.255 2.491-.342 2.644-.517.222-.255-.428-.726-.807-.826zm7.51-3.222c-.334-.065-.607-.336-.746-.634-.06-.129-.22-.651-.22-.651l-1.609.22c.05.183-.027.417-.008.793.017.335-.058.748.042.917.099.169.601.571 1.027.629 1.088.148 2.141-.443 2.264-.604.176-.235-.416-.605-.75-.67z"/><path fill="#FFAC33" d="M16.188 2.219c.875-1.312 2.774-1.438 3.637-.469S21.01 4 22.163 4c.368 0 .552.344-.212.688S18.062 5.719 16.875 3.5c-.531-.656-.687-1.281-.687-1.281z"/><path fill="#292F33" d="M22.777 22.241c.023-.706.412-2.193.265-2.824-.229-.981-1.5-2.047-2.677-2.948-1.177-.901-2.375-1.438-2.375-1.438-.302-1.896.242-2.896.235-3.716-.006-.684-.433-2.648-1.006-3.315h-1.565s.246 1.013-.647 1.112C14.112 9.211 13.56 8 13.56 8l-1.748.167c-.278.043-.549.125-.813.236.376.639.23 2.285 0 2.841.823 1.188 1.536 3.003 1.146 5.256-.346 2.002.473 3.889.473 4.324 0 0-.503 1.749-.2 2.898.403 1.529.768 2.884.81 3.423 1.412 0 1.981-.39 1.981-.39s-.278-.638-.165-1.577c.069-.572.351-1.455.351-2.304 0-.849-.022-1.461.104-1.812s.52-1.576.812-2.704c.534.292 1.493.792 2.084.954.849.232 1.494.595 1.718.79s.376.335.376.335-.07.625-.01 1.583c.055.877.53 1.551.636 2.596.893-.133 1.739-.528 1.739-.528s-.096-1.267-.077-1.847z"/><path fill="#67757F" d="M12.375 8.594l.904-.086s1.202 1.373 2.096 1.274c.894-.099.841-1.354.841-1.354h1.269c-.085-.168-.173-.319-.266-.428h-1.565s.246 1.013-.647 1.112C14.112 9.211 13.56 8 13.56 8l-1.748.167c-.278.043-.549.125-.813.236.077.131.128.311.165.509.346-.118.973-.282 1.211-.318zm8.667 13.854c-.06-.958.01-1.583.01-1.583s-.151-.141-.376-.335c-.068-.059-.186-.136-.326-.218l.139.126s-.07.625-.01 1.583c.055.877.53 1.551.636 2.596.158-.024.313-.057.464-.093-.175-.763-.492-1.357-.537-2.076zm-8.061 1.701c-.303-1.149.2-2.898.2-2.898 0-.435-.798-2.791-.452-4.793 4-.021 5.26-1.427 5.26-1.427s-2.719 1.26-5.201.533c-.074-1.788-.788-3.661-1.707-4.579-.025.1-.053.188-.082.258.823 1.188 1.536 3.003 1.146 5.256-.346 2.002.473 3.889.473 4.324 0 0-.503 1.749-.2 2.898.403 1.529.768 2.884.81 3.423.178 0 .342-.006.494-.017-.129-.672-.421-1.766-.741-2.978z"/></svg>
\ No newline at end of file