This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml		2019-03-28 13:01:33 +01:00
..
admin	Add order options to relationship manager UI (#10404)	2019-03-28 02:16:01 +01:00
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
flashes_helper.rb	…
home_helper.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
instance_helper.rb	…
jsonld_helper.rb	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
routing_helper.rb	…
settings_helper.rb	Add missing locales (bn, ga, hi) (#10295)	2019-03-18 21:55:21 +01:00
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00