Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 2421d4f

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite
Conflicts: lib/ServiceStack.Client.dll lib/ServiceStack.Common.dll lib/ServiceStack.Interfaces.dll lib/ServiceStack.Text.dll lib/ServiceStack.Text.pdb
2 parents d1e37b0 + 280be80 commit 2421d4f

22 files changed

+6748
-7226
lines changed

‎lib/ServiceStack.Common.pdb

-38 KB
Binary file not shown.

‎lib/ServiceStack.Text.XML

Lines changed: 354 additions & 354 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/ServiceStack.dll

47.5 KB
Binary file not shown.

‎lib/signed/ServiceStack.Text.XML

Lines changed: 206 additions & 770 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/signed/ServiceStack.Text.dll

-58 KB
Binary file not shown.

‎lib/tests/ServiceStack.Client.dll

7 KB
Binary file not shown.

‎lib/tests/ServiceStack.Client.xml

Lines changed: 98 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/tests/ServiceStack.Common.Tests.dll

14.5 KB
Binary file not shown.

‎lib/tests/ServiceStack.Common.Tests.pdb

-214 KB
Binary file not shown.

‎lib/tests/ServiceStack.Common.dll

3 KB
Binary file not shown.

0 commit comments

Comments
 (0)