Files
Mastodon/app/javascript/mastodon/locales
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00
..
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-13 16:49:19 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-13 20:17:56 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2017-11-20 22:13:37 -08:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-09 15:52:42 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 23:46:19 +02:00
2019-06-18 22:58:18 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 23:46:19 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-18 22:58:18 +02:00
2019-06-09 15:52:42 +02:00
2019-06-12 15:56:18 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-30 23:09:02 +02:00
2019-06-18 22:58:18 +02:00
2019-06-12 15:56:18 +02:00