Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
..
2019-04-10 17:17:17 +02:00
2019-04-10 14:50:14 +02:00
2019-04-05 06:12:08 +09:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2019-04-19 00:57:39 +02:00
2019-04-10 14:49:40 +02:00
2019-03-16 11:23:22 +01:00
2019-04-21 18:44:51 +02:00
2019-04-13 21:23:41 +09:00
2019-04-10 14:52:08 +02:00
2019-04-18 15:08:59 +09:00
2019-03-12 17:34:00 +01:00