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 a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/locales/en.yml
	config/locales/fr.yml
	config/locales/simple_form.pl.yml
	config/themes.yml

Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
8 years ago
..
assets Add emoji autosuggest (#5053) 9 years ago
devise Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) 8 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
paperclip Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
tasks Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
templates/haml/scaffold Adding simple_form, adding profile settings, header image 10 years ago