Thibaut Girka
12c8ac9e14
Merge branch 'master' into glitch-soc/merge-upstream ...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict due to glitch-soc having to take care of local-only
pinned toots in that controller.
Took upstream's changes and restored the local-only special
handling.
- `app/controllers/auth/sessions_controller.rb`:
Minor conflicts due to the theming system, applied upstream
changes, adapted the following two files for glitch-soc's
theming system:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`
- `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
Minor conflict due to glitch-soc having to handle local-only
toots specially. Applied upstream changes and restored
the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
Minor conflict due to the theming system.
- `package.json`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
- `yarn.lock`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
2020-06-09 10:39:20 +02:00
2018-12-01 17:39:13 +01:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-28 13:44:57 +02:00
2020-05-13 22:35:20 +02:00
2020-06-09 10:39:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2017-11-20 22:13:37 -08:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-14 18:49:10 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-25 12:30:34 +02:00
2020-05-25 12:30:34 +02:00
2020-05-25 12:30:34 +02:00
2020-05-25 12:30:34 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-14 18:49:10 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-25 12:30:34 +02:00
2020-05-13 22:35:20 +02:00
2017-05-07 19:55:47 +02:00
2018-07-24 20:47:13 +02:00
2017-05-07 19:55:47 +02:00
2019-03-24 18:44:59 +01:00
2019-09-16 15:11:01 +02:00
2017-05-17 17:50:39 +02:00
2018-05-07 01:34:19 +02:00
2018-07-11 01:14:38 +02:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2019-06-10 21:36:20 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2019-09-29 17:10:01 +02:00
2017-05-07 19:55:47 +02:00
2019-08-17 22:02:37 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2019-09-20 23:05:23 +02:00
2017-12-09 15:35:22 +01:00
2017-05-07 19:55:47 +02:00
2019-04-21 04:52:20 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-01-22 14:20:58 +01:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2020-01-12 15:18:03 +01:00
2017-05-07 19:55:47 +02:00
2017-06-13 03:55:28 +02:00
2018-08-18 01:00:01 +09:00
2020-01-12 15:18:03 +01:00
2019-02-23 18:41:28 +01:00
2019-11-13 23:24:55 +01:00
2017-07-04 16:11:23 +02:00
2019-06-12 15:56:18 +02:00
2019-01-08 14:09:57 +01:00
2019-10-03 03:36:52 +02:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2018-12-22 23:32:00 +01:00
2017-05-07 19:55:47 +02:00
2019-09-16 15:11:01 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2019-09-16 15:11:01 +02:00
2018-09-02 03:14:46 +02:00
2017-05-07 19:55:47 +02:00
2020-05-13 22:35:20 +02:00
2018-01-03 21:00:39 +09:00
2018-05-10 14:48:26 +02:00
2019-02-11 07:41:35 +01:00
2018-01-05 04:43:50 +01:00
2018-01-03 21:00:39 +09:00
2017-11-25 03:39:57 +01:00
2018-09-02 18:20:26 +02:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-09 14:12:35 +02:00
2017-05-07 19:55:47 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2017-05-07 19:55:47 +02:00
2017-07-10 14:02:18 +02:00
2017-05-30 23:09:02 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
2020-05-13 22:35:20 +02:00
12c8ac9e14