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
2020-02-08 23:33:22 +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-08 23:33:22 +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-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 09:22:58 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 09:22:58 +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-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-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-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-06 21:36:38 +01:00
2020-02-03 15:52:20 +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-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-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-09 12:15:55 +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-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-03 15:52:20 +01:00
2020-02-03 15:52:20 +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-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2019-09-16 15:11:01 +02:00
2019-09-29 17:10:01 +02:00
2019-08-17 22:02:37 +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-11-13 23:24:55 +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
2019-09-16 15:11:01 +02:00
2019-09-16 15:11:01 +02: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-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
dae5e446fe