You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		6 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
devise	Add ldap search filter (#8151)	6 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Merge commit 'dad7cd6d77f1bb090a7a64df405a920a1a1b2d83' into glitch-soc/merge-upstream	6 years ago
tasks	Merge branch 'master' into glitch-soc/master	6 years ago
templates	Add post-deployment migration system (#8182)	6 years ago