David Yip e931cf656d

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ...

Conflicts:
 	app/models/glitch/keyword_mute.rb

2018-06-12 16:39:30 -05:00

..

keyword_mute_helper.rb

Thread scopes through #matches?. #454.

2018-06-03 23:00:50 -05:00

keyword_mute.rb

Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 16:39:30 -05:00