summaryrefslogtreecommitdiff
path: root/priv/static/packs/core/embed.js
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2019-06-29 00:52:50 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2019-06-29 00:52:50 +0300
commit657277ffc0d3d25be4376ed629057a2d2cefb2e1 (patch)
tree3fdd4ca236669df9b2afc5bfcd0e5d6002e23666 /priv/static/packs/core/embed.js
parentc0fa0001476a8a45878a0c75125627164497eddf (diff)
parentc6668c2e7b9908e479527914ca7eb2c838aaab06 (diff)
downloadpleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.tar.gz
pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.zip
Resolve conflicts
Diffstat (limited to 'priv/static/packs/core/embed.js')
-rw-r--r--priv/static/packs/core/embed.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/static/packs/core/embed.js b/priv/static/packs/core/embed.js
index e7feae4e3..e5dcff4c0 100644
--- a/priv/static/packs/core/embed.js
+++ b/priv/static/packs/core/embed.js
@@ -1,2 +1,2 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{824:function(e,t){window.addEventListener("message",function(e){var t=e.data||{};function n(){window.parent.postMessage({type:"setHeight",id:t.id,height:document.getElementsByTagName("html")[0].scrollHeight},"*")}window.parent&&"setHeight"===t.type&&(["interactive","complete"].includes(document.readyState)?n():document.addEventListener("DOMContentLoaded",n))})}},[[824,0]]]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{828:function(e,t){window.addEventListener("message",function(e){var t=e.data||{};function n(){window.parent.postMessage({type:"setHeight",id:t.id,height:document.getElementsByTagName("html")[0].scrollHeight},"*")}window.parent&&"setHeight"===t.type&&(["interactive","complete"].includes(document.readyState)?n():document.addEventListener("DOMContentLoaded",n))})}},[[828,0]]]);
//# sourceMappingURL=embed.js.map \ No newline at end of file