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 dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.pl.yml		2019-01-16 14:20:07 +01: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-01-16 14:20:07 +01:00
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	2018-09-17 21:09:59 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00