mastodon/app/helpers
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
	Gemfile.lock
2018-01-15 22:17:48 -06:00
..
admin Fix nil error in log_target_from_history helper (#6173) 2018-01-04 10:56:23 +09:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
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
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 Adding Serbian latin translations (#6146) 2018-01-02 20:39:12 +09:00
stream_entries_helper.rb