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-02 20:04:46 +02:00
2019-10-10 17:26:08 +02:00
2019-10-03 11:10:12 +02:00
2019-10-10 17:26:08 +02:00
2019-10-10 17:26:08 +02:00
2019-09-18 16:37:27 +02:00
2019-10-10 17:26:08 +02:00
2019-08-06 13:16:53 +02:00
2019-10-03 11:10:12 +02:00
2019-10-03 11:10:12 +02:00
2019-10-10 17:26:08 +02:00
2019-08-30 13:38:41 +02:00
2019-10-10 17:26:08 +02:00
2019-10-04 19:49:43 +02:00