fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
---|---|---|
.. | ||
admin.rb | ||
api.rb | ||
settings.rb |
fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
---|---|---|
.. | ||
admin.rb | ||
api.rb | ||
settings.rb |