This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes		2019-02-01 16:12:20 +01:00
..
admin	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-13 14:41:06 +01:00
flashes_helper.rb	…
home_helper.rb	Make avatar and headers respect `auto_play_gif` (#9515)	2018-12-14 20:34:18 +01:00
instance_helper.rb	…
jsonld_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add support for Malayalam in language filter (#9624)	2018-12-25 18:29:30 +01:00
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00