Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.

2018-10-05 15:23:57 +02:00

10 KiB

Raw Blame History

View Raw