• Thibaut Girka's avatar
    Merge branch 'master' into glitch-soc/merge-upstream · 41a98b65
    Thibaut Girka authored
    Conflicts:
    - README.md
    - app/helpers/statuses_helper.rb
      Upstream moved account helpers to their own file, we had extra
      helpers there, moved too.
    - app/lib/sanitize_config.rb
    - app/models/user.rb
    - app/serializers/initial_state_serializer.rb
    - config/locales/simple_form.en.yml
    - spec/lib/sanitize_config_spec.rb
    41a98b65
Name
Last commit
Last update
..
ISSUE_TEMPLATE Loading commit data...
CODEOWNERS Loading commit data...
FUNDING.yml Loading commit data...
stale.yml Loading commit data...