Henry Jameson db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update ... * upstream/develop: (116 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 ...		2019-09-08 13:44:29 +03:00
..
after_store.js	Merge remote-tracking branch 'upstream/develop' into emoji-selector-update	2019-09-08 13:44:29 +03:00
routes.js	Password reset page	2019-09-05 11:23:28 +00:00