* origin/develop:
  quick fix for alignment in avatars, juggling multiple branches is confusing
  fix even more issues with avatars
  Update dependency ora to v0.4.1
  Update dependency mini-css-extract-plugin to v0.12.0
  Update dependency karma-firefox-launcher to v1.3.0
  fix avatars in mobile view

quick fix for alignment in avatars

See merge request !1483

Update dependency mini-css-extract-plugin to v0.12.0

See merge request !1480

fix even more issues with avatars

See merge request !1482

# Conflicts:
#   src/components/status/status.scss

Update dependency ora to v0.4.1

See merge request !1481

Update dependency karma-firefox-launcher to v1.3.0

See merge request !1475

fix avatars in mobile view

See merge request !1479

* origin/develop:
  improve the looks of bot indicator
  fix bot indicator appearing on retweeter avatar
  Update dependency localforage to v1.10.0
  Update dependency http-proxy-middleware to v0.21.0
  Update dependency eslint-plugin-standard to v4.1.0
  Update dependency eslint-plugin-import to v2.25.4
  Update babel monorepo to v7.17.8
  Update dependency iso-639-1 to v2.1.13
  Update dependency express to v4.17.3
  Update dependency eslint-plugin-promise to v4.3.1
  Update dependency eslint-loader to v2.2.1

Bot indicator fixes

See merge request !1477

Update dependency localforage to v1.10.0

See merge request !1476

Update dependency eslint-plugin-standard to v4.1.0

See merge request !1471

Update babel monorepo to v7.17.8

See merge request !1469

Update dependency http-proxy-middleware to v0.21.0

See merge request !1473

Update dependency eslint-plugin-import to v2.25.4

See merge request !1468