mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 08:54:40 +00:00
ab5f450700
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |