Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
admin	Add dormant filter to relationship manager, rename other filters (#10308)	2019-03-18 03:53:17 +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	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
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