Skip to content

Commit 2e146df

Browse files
committed
Merge branch '6.0' into 7.0
# Conflicts: # Orm/Xtensive.Orm.Tests/Upgrade/DomainUpgradeTest.cs # Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion1.cs # Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion2.cs # Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion3.cs # Orm/Xtensive.Orm.Tests/Upgrade/Upgrader.cs # Version.props
2 parents b847a97 + 190d546 commit 2e146df

File tree

6 files changed

+773
-686
lines changed

6 files changed

+773
-686
lines changed

0 commit comments

Comments
 (0)