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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
admin	…
settings	…
application_helper.rb	…
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	…
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	…
stream_entries_helper.rb	…