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-05-23 19:01:30 +02:00
2018-12-03 01:32:08 +01:00
2019-02-28 15:22:21 +01:00
2019-04-08 07:28:27 +02:00
2018-08-25 13:25:39 +02:00
2018-03-26 14:02:10 +02:00
2019-02-02 19:11:38 +01:00
2018-12-17 03:14:13 +01:00
2018-06-09 22:46:54 +02:00
2017-05-18 21:10:41 +02:00
2017-05-18 21:10:41 +02:00
2017-08-26 12:40:03 +02:00
2018-03-13 08:15:24 +01:00
2018-10-07 23:44:58 +02:00
2017-09-10 09:58:38 +02:00
2018-01-15 04:34:28 +01:00
2019-03-16 20:18:47 +01:00
2017-04-03 18:55:06 +02:00
2017-11-18 00:16:48 +01:00
2019-02-28 15:22:21 +01:00
2019-02-03 03:59:51 +01:00
2017-10-06 20:39:08 +02:00
2018-11-08 21:05:42 +01:00
2017-04-04 00:53:20 +02:00
2018-10-07 23:44:58 +02:00
2017-04-04 00:53:20 +02:00
2019-03-14 14:04:07 +01:00
2018-05-03 23:02:46 +02:00
2019-01-20 12:57:05 +01:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00
2018-08-21 12:25:50 +02:00
2018-01-17 23:56:03 +01:00
2017-04-08 13:26:03 +02:00
2016-12-19 09:31:12 +01:00
2018-01-22 14:25:09 +01:00
2017-04-05 21:43:10 +02:00
2019-02-28 15:22:21 +01:00
2017-01-05 03:28:21 +01:00
2019-01-05 11:27:58 +01:00
2017-04-04 00:53:20 +02:00
2018-09-18 16:45:58 +02:00