You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
|
5 years ago |
| .. |
|
migrate
|
…
|
|
|
post_migrate
|
…
|
|
|
schema.rb
|
…
|
|
|
seeds.rb
|
…
|
|
