tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka 280d7b1df8 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 Fix db:seed - only run some validations when the field was changed (#3592) 2017-06-08 09:22:01 -04:00