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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +01:00

..

admin

Add domain search/filter to the "Federation" (/admin/instances) page (#10071)

2019-02-18 14:59:19 +01:00

settings

…

application_helper.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-13 14:41:06 +01:00

flashes_helper.rb

…

home_helper.rb

Make avatar and headers respect auto_play_gif (#9515)

2018-12-14 20:34:18 +01:00

instance_helper.rb

Do not default site_title with site_hostname in InstanceHelper (#6624)

2018-03-04 20:29:49 +01:00

jsonld_helper.rb

Do not error out on unsalvageable errors in FetchRepliesService (#10175)

2019-03-05 15:21:14 +01:00

routing_helper.rb

…

settings_helper.rb

I18n: Add language options for Kazakh and Lithuanian (#10104)

2019-02-23 22:20:35 +01:00

stream_entries_helper.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-05 19:23:16 +01:00