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
..
2019-10-10 19:59:27 +02:00
2019-09-20 23:05:23 +02:00
2019-09-10 12:43:06 +02:00
2019-10-10 19:59:27 +02:00
2019-09-16 15:11:01 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 20:30:28 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 20:30:28 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-09-10 12:43:06 +02:00
2019-10-10 19:59:27 +02:00
2019-09-10 12:43:06 +02:00
2019-10-10 19:59:27 +02:00
2019-09-10 12:43:06 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-09-10 12:43:06 +02:00
2019-10-03 03:36:52 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-09-16 15:11:01 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-09-16 15:11:01 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 20:30:28 +02:00
2019-09-10 12:43:06 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 20:30:28 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-10 19:59:27 +02:00