You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 89a9d629f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock		7 years ago
..
admin	Fix nil error in log_target_from_history helper (#6173)	7 years ago
settings	…
application_helper.rb	…
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	Fix bad URL schemes being accepted (#6219)	7 years ago
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	7 years ago
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	7 years ago
settings_helper.rb	Adding Serbian latin translations (#6146)	7 years ago
stream_entries_helper.rb	…