mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 13:04:59 +00:00
b481e4fac1
Conflicts: config/locales/simple_form.ja.yml |
||
---|---|---|
.. | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
helpers | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
services | ||
support | ||
validators | ||
views | ||
workers | ||
rails_helper.rb | ||
spec_helper.rb |