masto-fe/db
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.
2018-06-02 16:15:36 -05:00
..
migrate Merge remote-tracking branch 'origin/master' into gs-master 2018-06-02 16:15:36 -05:00
schema.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-31 01:17:25 +00:00
seeds.rb Fix db:seed - only run some validations when the field was changed (#3592) 2017-06-08 09:22:01 -04:00