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 ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		7 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
devise	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
paperclip	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
tasks	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
templates/haml/scaffold	Adding simple_form, adding profile settings, header image	9 years ago