82e197787f
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one |
||
---|---|---|
.. | ||
chewy | ||
controllers | ||
helpers | ||
javascript | ||
lib | ||
mailers | ||
middleware | ||
models | ||
policies | ||
presenters | ||
serializers | ||
services | ||
validators | ||
views | ||
workers |