mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-14 20:24:17 -05:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
helpers | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
services | ||
support | ||
validators | ||
views | ||
workers | ||
rails_helper.rb | ||
spec_helper.rb |