mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2026-09-03 05:10:16 +03:00
Resolved conflicts by: - Using V2's @app path aliases for imports - Keeping settingsPage's admin settings features and legal policy links - Keeping settingsPage's first login password change feature - Combining imports where both branches added functionality