mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-29 08:29:03 +01:00
3465d39494
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did. |
||
---|---|---|
.. | ||
admin.tsx | ||
application.ts | ||
common.js | ||
embed.tsx | ||
error.ts | ||
inert.ts | ||
mailer.ts | ||
public-path.ts | ||
public.tsx | ||
remote_interaction_helper.ts | ||
share.tsx | ||
sign_up.ts | ||
two_factor_authentication.ts |