David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master		2017-11-16 22:52:37 -06:00
..
admin	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper_spec.rb	…
flashes_helper_spec.rb	…
home_helper_spec.rb	Fix locale related specs (#3707)	2017-06-12 10:58:03 +02:00
instance_helper_spec.rb	Fallback to site_hostname when site_title is empty (#4394)	2017-07-27 15:13:49 +02:00
jsonld_helper_spec.rb	Validate id of ActivityPub representations (#5114)	2017-10-04 01:13:48 +02:00
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	2017-08-21 12:42:16 +02:00
settings_helper_spec.rb	Fix language filter codes (#4841)	2017-09-08 12:32:22 +02:00
stream_entries_helper_spec.rb	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00