djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-11 10:12:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/db
History
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
migrate
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 19:23:16 +01:00
post_migrate
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 13:23:02 +01:00
schema.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 19:23:16 +01:00
seeds.rb
Fix db/seeds.rb (#9738)
2019-01-07 08:14:53 +01:00