mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-07 12:33:42 +01:00
a482932649
Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.jsx |