Thibaut Girka
c0dc247bce
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
2019-04-07 04:59:13 +02:00
2019-05-08 18:01:33 +02:00
2019-04-09 05:02:48 +02:00
2019-02-16 11:56:09 +01:00
2018-09-14 17:59:48 +02:00
2019-05-23 19:01:30 +02:00
2019-05-03 06:20:35 +02:00
2019-02-16 11:56:09 +01:00
2019-03-30 01:41:35 +01:00
2018-09-14 17:59:48 +02:00
2018-09-14 17:59:48 +02:00
2019-02-16 11:56:09 +01:00
2019-04-09 05:02:48 +02:00
2019-04-09 05:02:48 +02:00
2017-05-03 02:04:16 +02:00
2019-05-23 01:35:22 +02:00
2019-02-14 15:46:42 +01:00
2019-03-01 11:11:35 +01:00
2019-02-04 04:45:29 +01:00
2018-09-14 17:59:48 +02:00
2019-02-01 00:14:05 +01:00
2019-02-13 18:52:02 +01:00
2019-02-01 00:14:05 +01:00
2018-09-14 17:59:48 +02:00
2019-02-16 11:56:09 +01:00
2019-05-03 06:20:35 +02:00
2018-09-28 02:11:14 +02:00
2019-02-05 19:11:24 +01:00
2018-09-14 17:59:48 +02:00
2019-04-27 03:24:09 +02:00
2019-03-18 18:34:56 +01:00
2019-05-18 14:41:16 +02:00
2019-05-23 01:35:22 +02:00
2019-05-03 16:16:30 +02:00