* upstream/develop: (83 commits)
Password reset page
add a comment
force img updating immediately
Fixed "sequimiento" to "seguimiento".
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
Use mastodon api in follow requests
"Optional" in lowercase.
Update es.json
fix pin/unpin status logic
rename a mutation
update
fix user avatar fallback logic
remove dead code
Corrected "Media Proxy" translation.
Update es.json
make bio textarea resizable vertically only
remove dead code
Make image orientation consistent on FF, fix videos w/ modal
remove dead code
fix crazy watch logic in conversation
...
* upstream/develop: (59 commits)
Fix pipelines and clean up console output
switch from method to computed property
formatting
add tags to data and to status component
Remove auto-hyphenation
make staff label visible
move visibility-tray css in local scope
refactor css
make only screen name as link
refactor css for visibility tray
moved setting styles into common to avoid bug with shared styles
hide three dot menu button if has no items
Eliminate automatic zooming on mobile
entity normalizer: add tooltip text to emojis
rename for consistency's sake
update admin api urls in accordance with new docs
Line up rich text format picker with the status form
fix lint
Cleanup, little documentation, localization
update api service functions
...
* upstream/develop:
oof
slightly changed the code to have less mutations, added comments
more damage control
fix chrome
Prevent html-minifier to remove placeholder comment in index.html template
Add placeholder to insert server generated metatags. Related to #430
Added support for async following including delayed confirmation if we followed user or not
search button for user finder
hide logo when opening search bar on small screens
