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 14:52:08 +02:00
2019-04-08 21:14:08 +09:00
2019-04-21 04:52:20 +02:00
2019-04-21 04:48:47 +02:00
2017-11-20 22:13:37 -08:00
2019-04-08 12:35:37 +09:00
2019-04-21 04:46:08 +02:00
2019-04-13 21:23:41 +09:00
2019-04-21 04:52:20 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-30 23:09:02 +02:00