From: sadposter Date: Sun, 9 Feb 2020 18:12:40 +0000 (+0000) Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7de32e2c8b77eba414d376dedfdb8f782847ce46;p=akkoma Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop --- 7de32e2c8b77eba414d376dedfdb8f782847ce46 diff --cc priv/static/index.html index 5a99251a9,bf7ee958b..1f081eed4 --- a/priv/static/index.html +++ b/priv/static/index.html @@@ -1,1 -1,1 +1,5 @@@ - Pleroma
-Pleroma
++<<<<<<< HEAD ++Pleroma
++======= ++Pleroma
++>>>>>>> 544bdbfb90d764a5aba8ed07c13b842838d76d73 diff --cc priv/static/sw-pleroma.js index a6302cbb3,f55ef0112..d97e9544f --- a/priv/static/sw-pleroma.js +++ b/priv/static/sw-pleroma.js @@@ -1,4 -1,4 +1,8 @@@ ++<<<<<<< HEAD +var serviceWorkerOption = {"assets":["/static/fontello.1580306824221.css","/static/font/fontello.1580306824221.eot","/static/font/fontello.1580306824221.svg","/static/font/fontello.1580306824221.ttf","/static/font/fontello.1580306824221.woff","/static/font/fontello.1580306824221.woff2","/static/img/nsfw.ca95de9.png","/static/css/app.ae04505b31bb0ee2765e.css","/static/js/app.6c9d89cde1a5896ed202.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.9ab182239f3a2abee89f.js","/static/js/2.59b096781ddca107175d.js"]}; ++======= + var serviceWorkerOption = {"assets":["/static/fontello.1581007281335.css","/static/font/fontello.1581007281335.eot","/static/font/fontello.1581007281335.svg","/static/font/fontello.1581007281335.ttf","/static/font/fontello.1581007281335.woff","/static/font/fontello.1581007281335.woff2","/static/img/nsfw.74818f9.png","/static/css/app.ae04505b31bb0ee2765e.css","/static/js/app.0aac253187b2af873849.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.c26cf2fc57e9c1975e8d.js","/static/js/2.9be9f9ec29f7536c73c3.js"]}; ++>>>>>>> 544bdbfb90d764a5aba8ed07c13b842838d76d73 !function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/",t(t.s=1)}([function(e,n){ /*!