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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
8 years ago
..
assets Add emoji autosuggest (#5053) 8 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/tentative-merge 8 years ago
paperclip Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
tasks Merge remote-tracking branch 'tootsuite/master' into merge-upstream 8 years ago
templates/haml/scaffold