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-06-20 02:52:34 +02:00
2017-11-24 02:05:53 +01:00
2019-07-30 11:10:46 +02:00
2019-07-30 11:10:46 +02:00
2017-12-01 16:40:02 +01:00
2019-08-19 11:40:42 +02:00
2017-11-18 00:16:48 +01:00
2019-09-29 22:58:01 +02:00
2019-06-20 02:52:34 +02:00
2017-01-13 03:24:41 +01:00