djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-03-17 08:50:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/db
History
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
migrate
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 12:07:50 +02:00
post_migrate
Revert "Remove conversation URI (#11423)" (#11424)
2019-07-28 17:47:37 +02:00
schema.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 12:07:50 +02:00
seeds.rb
Change unconfirmed user login behaviour (#11375)
2019-07-22 10:48:50 +02:00