treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/db
History
Thibaut Girka 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
 		2018-08-17 17:43:54 +02:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
seeds.rb
…