Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'

Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec See merge request pleroma/pleroma!104
2018-04-10 14:46:04 +00:00 · 2018-04-10 14:46:04 +00:00 · d7654f4b3c
commit d7654f4b3c
parent 6ff583e5e1 fc13a3ff24
71 changed files with 2 additions and 2 deletions
--- a/priv/static/packs/about.js
+++ b/priv/static/packs/about.js
--- a/priv/static/packs/about.js.map
+++ b/priv/static/packs/about.js.map
--- a/priv/static/packs/admin.js
+++ b/priv/static/packs/admin.js
--- a/priv/static/packs/admin.js.map
+++ b/priv/static/packs/admin.js.map
--- a/priv/static/packs/appcache/manifest.appcache
+++ b/priv/static/packs/appcache/manifest.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-#ver:2018-4-2 18:30:13
+#ver:2018-4-9 21:57:37
 #plugin:4.8.4
 CACHE:
--- a/priv/static/packs/application.js
+++ b/priv/static/packs/application.js
--- a/priv/static/packs/application.js.map
+++ b/priv/static/packs/application.js.map
--- a/priv/static/packs/common.js
+++ b/priv/static/packs/common.js
--- a/priv/static/packs/common.js.map
+++ b/priv/static/packs/common.js.map
--- a/priv/static/packs/default.css
+++ b/priv/static/packs/default.css
--- a/priv/static/packs/emoji_picker.js
+++ b/priv/static/packs/emoji_picker.js
--- a/priv/static/packs/emoji_picker.js.map
+++ b/priv/static/packs/emoji_picker.js.map
--- a/priv/static/packs/features/account_gallery.js
+++ b/priv/static/packs/features/account_gallery.js
--- a/priv/static/packs/features/account_gallery.js.map
+++ b/priv/static/packs/features/account_gallery.js.map
--- a/priv/static/packs/features/account_timeline.js
+++ b/priv/static/packs/features/account_timeline.js
--- a/priv/static/packs/features/account_timeline.js.map
+++ b/priv/static/packs/features/account_timeline.js.map
--- a/priv/static/packs/features/blocks.js
+++ b/priv/static/packs/features/blocks.js
--- a/priv/static/packs/features/blocks.js.map
+++ b/priv/static/packs/features/blocks.js.map
--- a/priv/static/packs/features/community_timeline.js
+++ b/priv/static/packs/features/community_timeline.js
--- a/priv/static/packs/features/community_timeline.js.map
+++ b/priv/static/packs/features/community_timeline.js.map
--- a/priv/static/packs/features/compose.js
+++ b/priv/static/packs/features/compose.js
--- a/priv/static/packs/features/compose.js.map
+++ b/priv/static/packs/features/compose.js.map
--- a/priv/static/packs/features/favourited_statuses.js
+++ b/priv/static/packs/features/favourited_statuses.js
--- a/priv/static/packs/features/favourited_statuses.js.map
+++ b/priv/static/packs/features/favourited_statuses.js.map
--- a/priv/static/packs/features/favourites.js
+++ b/priv/static/packs/features/favourites.js
--- a/priv/static/packs/features/favourites.js.map
+++ b/priv/static/packs/features/favourites.js.map
--- a/priv/static/packs/features/follow_requests.js
+++ b/priv/static/packs/features/follow_requests.js
--- a/priv/static/packs/features/follow_requests.js.map
+++ b/priv/static/packs/features/follow_requests.js.map
--- a/priv/static/packs/features/followers.js
+++ b/priv/static/packs/features/followers.js
--- a/priv/static/packs/features/followers.js.map
+++ b/priv/static/packs/features/followers.js.map
--- a/priv/static/packs/features/following.js
+++ b/priv/static/packs/features/following.js
--- a/priv/static/packs/features/following.js.map
+++ b/priv/static/packs/features/following.js.map
--- a/priv/static/packs/features/generic_not_found.js
+++ b/priv/static/packs/features/generic_not_found.js
--- a/priv/static/packs/features/generic_not_found.js.map
+++ b/priv/static/packs/features/generic_not_found.js.map
--- a/priv/static/packs/features/getting_started.js
+++ b/priv/static/packs/features/getting_started.js
--- a/priv/static/packs/features/getting_started.js.map
+++ b/priv/static/packs/features/getting_started.js.map
--- a/priv/static/packs/features/hashtag_timeline.js
+++ b/priv/static/packs/features/hashtag_timeline.js
--- a/priv/static/packs/features/hashtag_timeline.js.map
+++ b/priv/static/packs/features/hashtag_timeline.js.map
--- a/priv/static/packs/features/home_timeline.js
+++ b/priv/static/packs/features/home_timeline.js
--- a/priv/static/packs/features/home_timeline.js.map
+++ b/priv/static/packs/features/home_timeline.js.map
--- a/priv/static/packs/features/keyboard_shortcuts.js
+++ b/priv/static/packs/features/keyboard_shortcuts.js
--- a/priv/static/packs/features/keyboard_shortcuts.js.map
+++ b/priv/static/packs/features/keyboard_shortcuts.js.map
--- a/priv/static/packs/features/list_editor.js
+++ b/priv/static/packs/features/list_editor.js
--- a/priv/static/packs/features/list_editor.js.map
+++ b/priv/static/packs/features/list_editor.js.map
--- a/priv/static/packs/features/list_timeline.js
+++ b/priv/static/packs/features/list_timeline.js
--- a/priv/static/packs/features/list_timeline.js.map
+++ b/priv/static/packs/features/list_timeline.js.map
--- a/priv/static/packs/features/notifications.js
+++ b/priv/static/packs/features/notifications.js
--- a/priv/static/packs/features/notifications.js.map
+++ b/priv/static/packs/features/notifications.js.map
--- a/priv/static/packs/features/public_timeline.js
+++ b/priv/static/packs/features/public_timeline.js
--- a/priv/static/packs/features/public_timeline.js.map
+++ b/priv/static/packs/features/public_timeline.js.map
--- a/priv/static/packs/features/reblogs.js
+++ b/priv/static/packs/features/reblogs.js
--- a/priv/static/packs/features/reblogs.js.map
+++ b/priv/static/packs/features/reblogs.js.map
--- a/priv/static/packs/features/status.js
+++ b/priv/static/packs/features/status.js
--- a/priv/static/packs/features/status.js.map
+++ b/priv/static/packs/features/status.js.map
--- a/priv/static/packs/locale_en.js
+++ b/priv/static/packs/locale_en.js
--- a/priv/static/packs/locale_en.js.map
+++ b/priv/static/packs/locale_en.js.map
--- a/priv/static/packs/locale_pl.js
+++ b/priv/static/packs/locale_pl.js
--- a/priv/static/packs/locale_pl.js.map
+++ b/priv/static/packs/locale_pl.js.map
--- a/priv/static/packs/locale_pt-BR.js
+++ b/priv/static/packs/locale_pt-BR.js
--- a/priv/static/packs/locale_pt-BR.js.map
+++ b/priv/static/packs/locale_pt-BR.js.map
--- a/priv/static/packs/locale_pt.js
+++ b/priv/static/packs/locale_pt.js
--- a/priv/static/packs/locale_pt.js.map
+++ b/priv/static/packs/locale_pt.js.map
--- a/priv/static/packs/modals/onboarding_modal.js
+++ b/priv/static/packs/modals/onboarding_modal.js
--- a/priv/static/packs/modals/onboarding_modal.js.map
+++ b/priv/static/packs/modals/onboarding_modal.js.map
--- a/priv/static/packs/public.js
+++ b/priv/static/packs/public.js
--- a/priv/static/packs/public.js.map
+++ b/priv/static/packs/public.js.map
--- a/priv/static/packs/share.js
+++ b/priv/static/packs/share.js
--- a/priv/static/packs/share.js.map
+++ b/priv/static/packs/share.js.map
--- a/priv/static/packs/status/media_gallery.js
+++ b/priv/static/packs/status/media_gallery.js
--- a/priv/static/packs/status/media_gallery.js.map
+++ b/priv/static/packs/status/media_gallery.js.map
--- a/priv/static/sw.js
+++ b/priv/static/sw.js