mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-25 17:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/db
History
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
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00