You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/lib
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
assets Add emoji autosuggest (#5053) 9 years ago
devise Fix wrong string being used on login failure when using LDAP (#8534) 8 years ago
generators Add post-deployment migration system (#8182) 8 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
paperclip Unconditionally re-encode locally-uploaded images to strip metadata 8 years ago
tasks Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
templates Add post-deployment migration system (#8182) 8 years ago
cli.rb Add tootctl settings registrations open (#8829) 7 years ago