David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		2018-02-02 08:39:52 -06:00
..
migrate	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
schema.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00