diff --git a/CHANGELOG.md b/CHANGELOG.md
index de11dd7a9..1266d2dfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,18 +20,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Removed `:managed_config` option. In practice, it was accidentally removed with 2.0.0 release when frontends were
switched to a new configuration mechanism, however it was not officially removed until now.
-## unreleased-patch - ???
-
-### Fixed
-
-- Welcome Chat messages preventing user registration with MRF Simple Policy applied to the local instance
-- Mastodon API: the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
-
-## Unreleased-patch
+## [2.1.2] - 2020-09-17
### Security
-- Fix most MRF rules either crashing or not being applied to objects passed into the Common Pipeline (ChatMessage, Question, Answer, Audio, Event)
+- Fix most MRF rules either crashing or not being applied to objects passed into the Common Pipeline (ChatMessage, Question, Answer, Audio, Event).
+
+### Fixed
+
+- Welcome Chat messages preventing user registration with MRF Simple Policy applied to the local instance.
+- Mastodon API: the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user.
+- Mastodon Streaming API: Handler crashes on authentication failures, resulting in error logs.
+- Mastodon Streaming API: Error logs on client pings.
+- Rich media: Log spam on failures. Now the error is only logged once per attempt.
+
+### Changed
+
+- Rich Media: A HEAD request is now done to the url, to ensure it has the appropriate content type and size before proceeding with a GET.
+
+### Upgrade notes
+
+1. Restart Pleroma
## [2.1.1] - 2020-09-08
diff --git a/priv/static/index.html b/priv/static/index.html
index 6fa237768..f5690a8d6 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1 +1 @@
-
Pleroma
\ No newline at end of file
+Pleroma
\ No newline at end of file
diff --git a/priv/static/static/font/fontello.1599568314856.woff b/priv/static/static/font/fontello.1599568314856.woff
deleted file mode 100644
index 64f566383..000000000
Binary files a/priv/static/static/font/fontello.1599568314856.woff and /dev/null differ
diff --git a/priv/static/static/font/fontello.1599568314856.woff2 b/priv/static/static/font/fontello.1599568314856.woff2
deleted file mode 100644
index 972e70831..000000000
Binary files a/priv/static/static/font/fontello.1599568314856.woff2 and /dev/null differ
diff --git a/priv/static/static/font/fontello.1599568314856.eot b/priv/static/static/font/fontello.1600365488745.eot
similarity index 89%
rename from priv/static/static/font/fontello.1599568314856.eot
rename to priv/static/static/font/fontello.1600365488745.eot
index 1a6931a0e..255f50372 100644
Binary files a/priv/static/static/font/fontello.1599568314856.eot and b/priv/static/static/font/fontello.1600365488745.eot differ
diff --git a/priv/static/static/font/fontello.1599568314856.svg b/priv/static/static/font/fontello.1600365488745.svg
similarity index 98%
rename from priv/static/static/font/fontello.1599568314856.svg
rename to priv/static/static/font/fontello.1600365488745.svg
index 71b5d70af..9eddf62ea 100644
--- a/priv/static/static/font/fontello.1599568314856.svg
+++ b/priv/static/static/font/fontello.1600365488745.svg
@@ -92,6 +92,8 @@
+
+
diff --git a/priv/static/static/font/fontello.1599568314856.ttf b/priv/static/static/font/fontello.1600365488745.ttf
similarity index 89%
rename from priv/static/static/font/fontello.1599568314856.ttf
rename to priv/static/static/font/fontello.1600365488745.ttf
index 795464475..6bda99d50 100644
Binary files a/priv/static/static/font/fontello.1599568314856.ttf and b/priv/static/static/font/fontello.1600365488745.ttf differ
diff --git a/priv/static/static/font/fontello.1600365488745.woff b/priv/static/static/font/fontello.1600365488745.woff
new file mode 100644
index 000000000..11c866ae0
Binary files /dev/null and b/priv/static/static/font/fontello.1600365488745.woff differ
diff --git a/priv/static/static/font/fontello.1600365488745.woff2 b/priv/static/static/font/fontello.1600365488745.woff2
new file mode 100644
index 000000000..06151d28c
Binary files /dev/null and b/priv/static/static/font/fontello.1600365488745.woff2 differ
diff --git a/priv/static/static/fontello.1599568314856.css b/priv/static/static/fontello.1600365488745.css
similarity index 89%
rename from priv/static/static/fontello.1599568314856.css
rename to priv/static/static/fontello.1600365488745.css
index e636286c0..781ff7620 100644
Binary files a/priv/static/static/fontello.1599568314856.css and b/priv/static/static/fontello.1600365488745.css differ
diff --git a/priv/static/static/fontello.json b/priv/static/static/fontello.json
index 706800cdb..b0136fd90 100644
--- a/priv/static/static/fontello.json
+++ b/priv/static/static/fontello.json
@@ -405,6 +405,12 @@
"css": "block",
"code": 59434,
"src": "fontawesome"
+ },
+ {
+ "uid": "3e674995cacc2b09692c096ea7eb6165",
+ "css": "megaphone",
+ "code": 59435,
+ "src": "fontawesome"
}
]
}
\ No newline at end of file
diff --git a/priv/static/static/js/2.c92f4803ff24726cea58.js.map b/priv/static/static/js/2.c92f4803ff24726cea58.js.map
deleted file mode 100644
index e3cc6a3fb..000000000
Binary files a/priv/static/static/js/2.c92f4803ff24726cea58.js.map and /dev/null differ
diff --git a/priv/static/static/js/2.c92f4803ff24726cea58.js b/priv/static/static/js/2.e852a6b4b3bba752b838.js
similarity index 66%
rename from priv/static/static/js/2.c92f4803ff24726cea58.js
rename to priv/static/static/js/2.e852a6b4b3bba752b838.js
index 55aa1f44e..42e446575 100644
Binary files a/priv/static/static/js/2.c92f4803ff24726cea58.js and b/priv/static/static/js/2.e852a6b4b3bba752b838.js differ
diff --git a/priv/static/static/js/2.e852a6b4b3bba752b838.js.map b/priv/static/static/js/2.e852a6b4b3bba752b838.js.map
new file mode 100644
index 000000000..d698f09e1
Binary files /dev/null and b/priv/static/static/js/2.e852a6b4b3bba752b838.js.map differ
diff --git a/priv/static/static/js/app.55d173dc5e39519aa518.js b/priv/static/static/js/app.55d173dc5e39519aa518.js
deleted file mode 100644
index d04ae3499..000000000
Binary files a/priv/static/static/js/app.55d173dc5e39519aa518.js and /dev/null differ
diff --git a/priv/static/static/js/app.55d173dc5e39519aa518.js.map b/priv/static/static/js/app.55d173dc5e39519aa518.js.map
deleted file mode 100644
index 600e97afa..000000000
Binary files a/priv/static/static/js/app.55d173dc5e39519aa518.js.map and /dev/null differ
diff --git a/priv/static/static/js/app.826c44232e0a76bbd9ba.js b/priv/static/static/js/app.826c44232e0a76bbd9ba.js
new file mode 100644
index 000000000..16762165e
Binary files /dev/null and b/priv/static/static/js/app.826c44232e0a76bbd9ba.js differ
diff --git a/priv/static/static/js/app.826c44232e0a76bbd9ba.js.map b/priv/static/static/js/app.826c44232e0a76bbd9ba.js.map
new file mode 100644
index 000000000..b188c3379
Binary files /dev/null and b/priv/static/static/js/app.826c44232e0a76bbd9ba.js.map differ
diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js
index 54c6ed8f0..fa4969025 100644
Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ