mastodon/.github
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
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
2019-10-27 12:14:01 +01:00
..
ISSUE_TEMPLATE Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
CODEOWNERS Move files for GitHub to .github directory (#5989) 2017-12-12 15:10:12 +01:00
FUNDING.yml Add sponsor button to GitHub web UI (#10814) 2019-05-23 15:00:54 +02:00
stale.yml Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00