…-core

# Conflicts:
#	backend/data/src/main/resources/db/changelog/schema.xml

The amount of time spent solving made up problems instead of working on real problems...

…-core

…-core

# Conflicts:
#	backend/api/src/main/kotlin/io/tolgee/hateoas/InitialDataModel.kt
#	backend/app/src/main/resources/application.yaml
#	backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2ImageUploadController/V2ImageUploadControllerTest.kt
#	backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2ProjectsController/V2ProjectsControllerTest.kt
#	backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2ScreenshotController/KeyScreenshotControllerTest.kt
#	backend/app/src/test/kotlin/io/tolgee/initialUserCreation/LegacyMigrationTest.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/ActivityService.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/views/ActivityViewByRevisionsProvider.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/views/ProjectActivityViewByPageableProvider.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/BatchJobActionService.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/BatchJobConcurrentLauncher.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/ProgressManager.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/events/OnBatchJobStatusUpdated.kt
#	backend/data/src/main/kotlin/io/tolgee/dialects/postgres/CustomPostgreSQLDialect.kt
#	backend/data/src/main/kotlin/io/tolgee/dtos/ComputedPermissionDto.kt
#	backend/data/src/main/kotlin/io/tolgee/dtos/request/key/KeyScreenshotDto.kt
#	backend/data/src/main/kotlin/io/tolgee/model/DismissedAnnouncement.kt
#	backend/data/src/main/kotlin/io/tolgee/model/UserAccount.kt
#	backend/data/src/main/kotlin/io/tolgee/repository/LanguageRepository.kt
#	backend/data/src/main/kotlin/io/tolgee/repository/UserAccountRepository.kt
#	backend/data/src/main/kotlin/io/tolgee/service/LanguageService.kt
#	backend/data/src/main/kotlin/io/tolgee/service/project/ProjectService.kt
#	backend/data/src/main/kotlin/io/tolgee/service/security/UserAccountService.kt
#	backend/data/src/main/resources/db/changelog/schema.xml
#	backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/NotificationsE2eDataController.kt
#	backend/testing/src/main/kotlin/io/tolgee/fixtures/scopeAssert.kt
#	backend/testing/src/main/kotlin/io/tolgee/fixtures/statusExpectations.kt

…-core

# Conflicts:
#	backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/InitialDataController.kt
#	backend/data/src/main/kotlin/io/tolgee/repository/LanguageRepository.kt
#	backend/data/src/main/resources/db/changelog/schema.xml

…-core

# Conflicts:
#	backend/data/src/main/kotlin/io/tolgee/model/UserAccount.kt

… cynthia/notifications-core

… cynthia/notifications-core

# Conflicts:
#	webapp/src/custom.d.ts
#	webapp/src/views/notifications/NotificationsRouter.tsx

# Conflicts:
#	backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/InitialDataController.kt
#	backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/keys/KeyController.kt
#	backend/api/src/main/kotlin/io/tolgee/hateoas/project/ProjectModelAssembler.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/ActivityService.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/views/ActivityViewByRevisionsProvider.kt
#	backend/data/src/main/resources/db/changelog/schema.xml
#	settings.gradle
#	webapp/package-lock.json
#	webapp/package.json
#	webapp/src/component/layout/TopBar/TopBar.tsx
#	webapp/src/store/index.ts

Hibernate once again complaining!