mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 20:45:13 +00:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
assets | ||
devise | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |