mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-15 19:07:59 +00:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
assets | ||
devise | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |