copilot-swe-agent[bot]
651b48658c
Merge origin/main into feature branch, resolving 3 conflicts: - app/api/__init__.py: add classification_rules_router alongside new routers from main (audit_logs, i18n, mobile, compliance, translation) - app/models.py: keep ClassificationRuleModel alongside new models from main (MobileDevice, ComplianceTemplate, PipelineRoutingRule) - tests/conftest.py: import both ClassificationRuleModel and new models from main (AuditLog, ComplianceTemplate) Also renumber migration from 027 to 037 to chain from the latest migration on main (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
|