YoheiZuho 69ad0a8763 直しきれてないコンフリクトの解消

2022-03-15 18:53:01 +09:00

..

assets.rake

Do not fetch environment variables to determine default locale (#6618)

2018-03-04 10:00:46 +01:00

auto_annotate_models.rake

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

db.rake

Fix null values being included in some indexes (#17711)

2022-03-12 08:12:57 +01:00

emojis.rake

Update emoji codepoint mappings to v13.1 (#16352)

2021-06-03 16:08:07 +02:00

mastodon.rake

Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338)

2022-02-02 23:30:15 +01:00

repo.rake

Remove language detection through cld3 (#17478)

2022-02-08 02:41:17 +01:00

statistics.rake

…

tests.rake

直しきれてないコンフリクトの解消

2022-03-15 18:53:01 +09:00