Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'

# Conflicts:
#   src/components/post_status_form/post_status_form.js
This commit is contained in:
Shpuld Shpludson 2020-07-07 12:05:30 +00:00
commit 0fe5d4cf10

View File

@ -25,10 +25,10 @@ const preloadFetch = async (request) => {
if (!data || !data[request]) {
return window.fetch(request)
}
const requestData = atob(data[request])
const requestData = JSON.parse(atob(data[request]))
return {
ok: true,
json: () => JSON.parse(requestData),
json: () => requestData,
text: () => requestData
}
}