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.

Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		6 years ago
..
admin	…
settings	…
application_helper_spec.rb	…
flashes_helper_spec.rb	…
home_helper_spec.rb	…
instance_helper_spec.rb	…
jsonld_helper_spec.rb	…
routing_helper_spec.rb	…
settings_helper_spec.rb	…
stream_entries_helper_spec.rb	…