Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

2018-04-03 18:34:07 +02:00 · 2018-04-03 18:34:07 +02:00 · bf953989cd
parent 806550c921 925fb2f871
commit bf953989cd
89 changed files with 1 additions and 1 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/appcache/manifest.appcache
+++ b/priv/static/packs/appcache/manifest.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-#ver:2018-4-1 11:28:19
+#ver:2018-4-2 18:30:13
 #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/base_polyfills.js
+++ b/priv/static/packs/base_polyfills.js
--- a/priv/static/packs/base_polyfills.js.map
+++ b/priv/static/packs/base_polyfills.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/extra_polyfills.js
+++ b/priv/static/packs/extra_polyfills.js
--- a/priv/static/packs/extra_polyfills.js.map
+++ b/priv/static/packs/extra_polyfills.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_ar.js
+++ b/priv/static/packs/locale_ar.js
--- a/priv/static/packs/locale_ar.js.map
+++ b/priv/static/packs/locale_ar.js.map
--- a/priv/static/packs/locale_ca.js
+++ b/priv/static/packs/locale_ca.js
--- a/priv/static/packs/locale_ca.js.map
+++ b/priv/static/packs/locale_ca.js.map
--- a/priv/static/packs/locale_eo.js
+++ b/priv/static/packs/locale_eo.js
--- a/priv/static/packs/locale_eo.js.map
+++ b/priv/static/packs/locale_eo.js.map
--- a/priv/static/packs/locale_fa.js
+++ b/priv/static/packs/locale_fa.js
--- a/priv/static/packs/locale_fa.js.map
+++ b/priv/static/packs/locale_fa.js.map
--- a/priv/static/packs/locale_fr.js
+++ b/priv/static/packs/locale_fr.js
--- a/priv/static/packs/locale_fr.js.map
+++ b/priv/static/packs/locale_fr.js.map
--- a/priv/static/packs/locale_ja.js
+++ b/priv/static/packs/locale_ja.js
--- a/priv/static/packs/locale_ja.js.map
+++ b/priv/static/packs/locale_ja.js.map
--- a/priv/static/packs/locale_ko.js
+++ b/priv/static/packs/locale_ko.js
--- a/priv/static/packs/locale_ko.js.map
+++ b/priv/static/packs/locale_ko.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_ru.js
+++ b/priv/static/packs/locale_ru.js
--- a/priv/static/packs/locale_ru.js.map
+++ b/priv/static/packs/locale_ru.js.map
--- a/priv/static/packs/locale_sk.js
+++ b/priv/static/packs/locale_sk.js
--- a/priv/static/packs/locale_sk.js.map
+++ b/priv/static/packs/locale_sk.js.map
--- a/priv/static/packs/locale_zh-CN.js
+++ b/priv/static/packs/locale_zh-CN.js
--- a/priv/static/packs/locale_zh-CN.js.map
+++ b/priv/static/packs/locale_zh-CN.js.map
--- a/priv/static/packs/locale_zh-HK.js
+++ b/priv/static/packs/locale_zh-HK.js
--- a/priv/static/packs/locale_zh-HK.js.map
+++ b/priv/static/packs/locale_zh-HK.js.map
--- a/priv/static/packs/locale_zh-TW.js
+++ b/priv/static/packs/locale_zh-TW.js
--- a/priv/static/packs/locale_zh-TW.js.map
+++ b/priv/static/packs/locale_zh-TW.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/sw.js
+++ b/priv/static/sw.js