mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-30 20:03:43 +01:00
6c99479ef4
Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well. |
||
|---|---|---|
| .. | ||
| exports | ||
| migration | ||
| preferences | ||
| two_factor_authentication | ||
| aliases_controller.rb | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| featured_tags_controller.rb | ||
| flavours_controller.rb | ||
| imports_controller.rb | ||
| login_activities_controller.rb | ||
| migrations_controller.rb | ||
| pictures_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentication_methods_controller.rb | ||
| verifications_controller.rb | ||