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.

David Yip e931cf656d Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ... Conflicts: app/models/glitch/keyword_mute.rb		7 years ago
..
keyword_mute.rb	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions	7 years ago
keyword_mute_helper.rb	Thread scopes through #matches?. #454.	7 years ago