mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-02-02 01:48:02 +00:00
b481e4fac1
Conflicts: config/locales/simple_form.ja.yml |
||
---|---|---|
.. | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
redis_config.rb | ||
snowflake.rb | ||
version.rb |