diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
| commit | 0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8 (patch) | |
| tree | 45a693814a7f1f7bd2d6108732f2b75086f1fa0a /priv/static/packs/mailer.js | |
| parent | 30261772063a30ca0ef299f441cfed4630ffb630 (diff) | |
| parent | 3448b434f54e8b4749524e3ccd876359a6501845 (diff) | |
| download | pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.tar.gz pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.zip | |
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
Diffstat (limited to 'priv/static/packs/mailer.js')
| -rw-r--r-- | priv/static/packs/mailer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/static/packs/mailer.js b/priv/static/packs/mailer.js index 4fb68ab3f..9d938ac6e 100644 --- a/priv/static/packs/mailer.js +++ b/priv/static/packs/mailer.js @@ -1,2 +1,2 @@ -webpackJsonp([67],{688:function(n,c,o){o(689)},689:function(n,c){}},[688]); +webpackJsonp([80],{680:function(n,c,o){o(681)},681:function(n,c){}},[680]); //# sourceMappingURL=mailer.js.map
\ No newline at end of file |