dfe851b476
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. |
||
---|---|---|
.. | ||
assets.rake | ||
auto_annotate_models.rake | ||
branding.rake | ||
db.rake | ||
emojis.rake | ||
glitchsoc.rake | ||
icons.rake | ||
mastodon.rake | ||
repo.rake | ||
sidekiq_unique_jobs.rake | ||
statistics.rake | ||
tests.rake | ||
webpacker.rake |