204000aabc
Resolve 3 merge conflicts and renumber the automation_hooks migration to follow main's migration chain (036_add_document_translation_fields). Conflicts resolved: - app/api/__init__.py: add automation_router alongside main's new routers - app/utils/settings_service.py: add automation_hooks_enabled alongside compliance_enabled - tests/conftest.py: add AutomationHook alongside AuditLog/ComplianceTemplate imports Migration renumbered: - 027_add_automation_hooks → 037_add_automation_hooks - down_revision: 026_add_scheduled_jobs → 036_add_document_translation_fields Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
22 lines
218 B
Plaintext
22 lines
218 B
Plaintext
node_modules/
|
|
.expo/
|
|
dist/
|
|
web-build/
|
|
ios/
|
|
android/
|
|
.env
|
|
google-services.json
|
|
GoogleService-Info.plist
|
|
*.jks
|
|
*.p8
|
|
*.p12
|
|
*.key
|
|
*.mobileprovision
|
|
*.orig.*
|
|
npm-debug.*
|
|
yarn-debug.*
|
|
yarn-error.*
|
|
.idea/
|
|
.DS_Store
|
|
Thumbs.db
|