luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-20 17:08:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	db/schema.rb
2018-01-09 14:16:45 -06:00
..
migrate Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-09 14:16:45 -06:00
schema.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-09 14:16:45 -06:00
seeds.rb