Thibaut Girka
dae5e446fe
Merge branch 'master' into glitch-soc/merge-upstream ...
Conflicts:
- `Gemfile`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `Gemfile.lock`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
Upstream added better unsupported link stripping,
while we had different sanitizing configs.
Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
Strings unused in glitch-soc had been removed from
glitch-soc, reintroduced them even if they are not
useful, to reduce the risk of later merge conflicts.
2020-02-09 12:15:55 +01:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2019-09-10 12:43:06 +02:00
2019-07-15 06:12:05 +02:00
2019-09-20 23:05:23 +02:00
2020-01-12 15:18:03 +01:00
2019-03-29 22:06:16 +09:00
2019-03-28 18:01:28 +01:00
2019-07-15 06:12:05 +02:00
2019-09-10 12:43:06 +02:00
2019-06-12 23:46:19 +02:00
2019-06-12 15:56:18 +02:00
2019-03-28 04:44:59 +01:00
2019-06-12 23:46:19 +02:00
2019-10-10 20:30:28 +02:00
2019-10-10 20:30:28 +02:00
2019-08-17 22:02:37 +02:00
2019-06-12 23:46:19 +02:00
2020-02-03 15:52:20 +01:00
2019-11-13 23:24:55 +01:00
2019-04-10 18:17:24 +02:00
2019-06-12 15:56:18 +02:00
2017-09-19 03:27:08 +02:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2019-08-17 22:02:37 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2019-06-22 00:57:48 +02:00
2019-06-12 15:56:18 +02:00
2018-08-18 01:00:01 +09:00
2020-01-12 15:18:03 +01:00
2019-04-10 18:17:24 +02:00
2019-11-13 23:24:55 +01:00
2019-06-13 16:49:19 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-04-10 22:33:04 +02:00
2019-06-13 16:49:19 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-06-12 15:56:18 +02:00
2019-04-10 20:43:08 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-02-11 07:41:35 +01:00
2018-01-02 20:39:12 +09:00
2017-12-31 17:28:20 +09:00
2019-10-10 19:59:27 +02:00
2020-01-12 15:18:03 +01:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-09-10 12:43:06 +02:00
2019-08-17 22:02:37 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2019-03-24 18:44:59 +01:00
2019-06-11 13:08:40 +09:00
2018-04-01 21:57:26 +09:00
2019-10-02 00:46:36 +02:00
2020-02-08 23:33:22 +01:00
2020-02-08 23:33:22 +01:00
2020-01-12 15:18:03 +01:00
2019-12-18 16:56:39 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2018-10-25 01:17:01 +02:00
2019-11-13 23:24:55 +01:00
2019-09-20 23:05:23 +02:00
2020-01-25 11:54:10 +01:00
2019-09-20 23:05:23 +02:00
2020-01-12 15:18:03 +01:00
2019-09-21 20:04:43 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-10-10 19:59:27 +02:00
2019-09-18 16:37:27 +02:00
2019-10-10 19:59:27 +02:00
2019-10-03 18:24:55 +02:00
2020-01-25 11:54:10 +01:00
2020-01-13 12:02:37 +01:00
2019-11-13 23:24:55 +01:00
2020-02-03 15:52:20 +01:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2020-02-03 15:52:20 +01:00
2019-06-12 15:56:18 +02:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2019-09-28 00:55:59 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2018-10-25 01:17:01 +02:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2018-08-18 01:00:01 +09:00
2020-02-08 23:33:22 +01:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2019-09-20 23:05:23 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-09-20 23:05:23 +02:00
2020-02-08 23:33:22 +01:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-07-15 06:12:05 +02:00
2019-02-23 18:41:28 +01:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2019-10-02 00:46:36 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-06-12 15:56:18 +02:00
2020-01-12 15:18:03 +01:00
2020-01-23 22:04:00 +01:00
2020-02-08 23:33:22 +01:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-09-16 15:11:01 +02:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-17 10:53:53 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2019-11-13 23:24:55 +01:00
2020-01-23 22:04:00 +01:00
2020-01-24 00:23:30 +01:00
2019-06-12 15:56:18 +02:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2020-01-23 22:04:00 +01:00
2019-06-12 15:56:18 +02:00
2020-01-23 22:04:00 +01:00
2019-06-12 15:56:18 +02:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2019-06-12 15:56:18 +02:00
2020-02-08 23:33:22 +01:00
2020-01-23 22:04:00 +01:00
2019-11-13 23:24:55 +01:00
2020-01-23 22:04:00 +01:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2019-06-22 00:57:48 +02:00
2019-02-11 07:41:35 +01:00
2018-01-02 20:39:12 +09:00
2017-12-31 17:28:20 +09:00
2020-01-23 22:04:00 +01:00
2020-01-13 12:02:37 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2020-01-23 22:04:00 +01:00
2020-01-25 11:54:10 +01:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-02-06 21:36:38 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2019-03-28 00:30:47 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-02-08 23:33:22 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-06 21:36:38 +01:00
2020-01-12 15:18:03 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2019-11-13 23:24:55 +01:00
2020-02-03 15:52:20 +01:00
2020-01-23 22:04:00 +01:00
2019-09-10 12:43:06 +02:00
2019-10-03 03:36:52 +02:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-12-18 16:56:39 +01:00
2020-02-08 23:33:22 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-09 12:15:55 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2019-06-12 15:56:18 +02:00
2019-11-13 23:24:55 +01:00
2019-09-16 15:11:01 +02:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-01-24 00:23:30 +01:00
2020-01-25 11:54:10 +01:00
2019-06-07 03:39:24 +02:00
2020-02-03 09:22:58 +01:00
2020-02-03 15:52:20 +01:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-01-24 00:23:30 +01:00
2020-01-25 11:54:10 +01:00
2019-06-12 15:56:18 +02:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2020-01-25 11:54:10 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-06 21:36:38 +01:00
2019-06-12 15:56:18 +02:00
2020-02-08 23:33:22 +01:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2020-02-03 15:52:20 +01:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2020-02-03 15:52:20 +01:00
2020-02-09 12:15:55 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2019-09-10 12:43:06 +02:00
2020-01-25 11:54:10 +01:00
2020-01-12 15:18:03 +01:00
2019-09-10 12:43:06 +02:00
2019-09-10 12:43:06 +02:00
2019-06-12 15:56:18 +02:00
2019-09-10 12:43:06 +02:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2019-06-12 15:56:18 +02:00
2020-02-03 15:52:20 +01:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-02-03 15:52:20 +01:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2020-02-08 23:33:22 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2019-06-12 15:53:04 +02:00
2020-01-12 15:18:03 +01:00
2019-06-12 15:53:04 +02:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2019-12-18 16:56:39 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2019-11-13 23:24:55 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
dae5e446fe