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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		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 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream	7 years ago
tasks	Add some feedback to maintenance rake tasks (#8173)	6 years ago
templates	Add post-deployment migration system (#8182)	6 years ago