gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-01-13 10:36:40 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
03cfe366fd
mastodon/db
History
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +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