Merge branch 'projectlock' of https://github.com/sebastienros/dapper-dot-net into sebastienros-projectlock

Browse Source

Conflicts:
	Dapper.DNX.Tests/project.lock.json
	Dapper/project.lock.json

...

This commit is contained in:

Marc Gravell

2015-11-06 14:10:14 -08:00

parent f7ffac3fd2 1b58d10bbd

commit 8d7f16a286

2 changed files with 0 additions and 4907 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Dapper.DNX.Tests/project.lock.json

-2650

File diff suppressed because it is too large Load Diff

Dapper/project.lock.json

-2257

File diff suppressed because it is too large Load Diff