Thibaut Girka
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
2019-10-10 17:26:08 +02:00
2019-08-19 21:49:35 +02:00
2019-10-10 17:26:08 +02:00
2019-09-17 16:59:16 +02:00
2019-10-08 22:08:55 +02:00
2019-09-29 05:03:19 +02:00
2019-07-07 16:16:51 +02:00
2019-09-05 11:36:41 +02:00
2019-08-30 01:34:47 +02:00
2018-09-18 16:45:58 +02:00
2019-04-07 04:59:13 +02:00
2019-04-07 04:59:13 +02:00
2019-08-19 21:49:35 +02:00
2019-10-03 22:37:13 +02:00
2017-04-11 01:11:41 +02:00
2019-09-30 12:23:57 +02:00
2018-02-16 07:22:20 +01:00
2019-09-05 06:14:30 +02:00
2019-07-22 10:48:50 +02:00
2019-08-19 21:49:35 +02:00
2019-03-28 13:01:33 +01:00
2019-03-14 05:28:30 +01:00
2019-07-07 16:16:51 +02:00
2019-09-30 12:23:57 +02:00
2019-10-08 22:08:55 +02:00
2019-08-19 21:49:35 +02:00
2019-10-10 17:26:08 +02:00
2019-08-19 21:49:35 +02:00
2019-09-18 16:37:27 +02:00
2019-08-01 19:14:02 +02:00