luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 04:07:45 +00:00
Code Issues Projects Releases Wiki Activity
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