David Yip 48d79007f6 Merge remote-tracking branch 'origin/master' into merge-upstream-20180121		2018-01-21 16:26:50 -06:00
..
admin	Fix nil error in log_target_from_history helper (#6173)	2018-01-04 10:56:23 +09:00
settings	…
application_helper.rb	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)	2018-01-20 03:49:06 +01:00
jsonld_helper.rb	Fix bad URL schemes being accepted (#6219)	2018-01-08 05:00:23 +01:00
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	2018-01-04 15:36:55 +01:00
settings_helper.rb	armenian translations initial commit (#6320)	2018-01-22 05:02:23 +09:00
stream_entries_helper.rb	…