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		2018-06-21 20:49:57 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +02:00
features	…
fixtures	…
helpers	…
lib	keyword mute: use mentions scope in home feed filtering (#454)	2018-06-12 17:14:35 -05:00
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
policies	…
presenters	…
requests	…
routing	…
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-12 13:17:21 +00:00
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…