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
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
json_ld	Preload common JSON-LD contexts (#9412)	2018-12-02 16:46:13 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
paperclip	add env var for max length of audio uploads	2019-04-16 16:07:20 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Add tootctl self-destruct (#10367)	2019-03-28 17:56:25 +01:00