mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-26 19:33:41 +01:00
e7f1bfdc2d
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js. |
||
---|---|---|
.. | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
helpers | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
services | ||
support | ||
validators | ||
views | ||
workers | ||
rails_helper.rb | ||
spec_helper.rb |