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-24 22:44:42 +02:00
2019-10-24 22:44:42 +02:00
2019-10-07 04:33:31 +02:00
2019-10-25 11:48:20 +02:00
2019-08-01 19:17:17 +02:00
2019-09-18 04:02:21 +02:00
2019-10-10 20:13:59 +02:00
2019-10-01 17:11:14 +02:00
2019-09-01 20:04:35 +02:00
2019-08-01 19:17:17 +02:00
2019-09-23 00:48:43 +02:00
2019-08-01 19:17:17 +02:00
2019-10-01 04:57:27 +02:00
2019-08-01 19:17:17 +02:00
2019-09-29 16:27:00 +02:00
2019-09-29 16:27:00 +02:00
2019-10-06 22:11:17 +02:00
2019-09-27 21:13:51 +02:00
2019-10-22 01:31:27 +09:00
2019-08-01 19:17:17 +02:00
2019-02-04 04:45:29 +01:00
2019-08-01 19:17:17 +02:00
2019-02-01 00:14:05 +01:00
2019-08-03 19:10:39 +02:00
2019-08-01 19:17:17 +02:00
2019-08-03 19:10:39 +02:00
2019-08-01 19:17:17 +02:00
2019-09-29 22:20:56 +02:00
2019-08-01 19:17:17 +02:00
2019-08-01 19:17:17 +02:00
2019-10-01 04:57:27 +02:00
2019-04-27 03:24:09 +02:00
2019-05-25 21:27:00 +02:00
2019-03-18 18:34:56 +01:00
2019-10-24 22:44:42 +02:00
2019-10-24 22:48:11 +02:00
2019-10-25 11:48:20 +02:00