* upstream/develop: (33 commits)
fix js error on mute
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Fix sent follow request detection
fix english settings label regarding how to view videos
fix extra buttons merge bug
make size of gif image and preview equal
css improvements
do not unmount post status modal in desktop
hide rich media preview image in case of broken image
Handle JSONified errors while registering
Focus on the search input when the search icon is clicked
prevent scrolling top when click search input
add zoom-in indication to avatar
add zoom-in icon
allow zooming avatar in profile panel header
use $route instead of $router.currentRoute
enlarge avatar in profile page
update unit test
...
cf22cf778c
