Merge branch relese-2.0 to master.

dreamfactorysoftware · Sep 25, 2015 · e157d14 · e157d14
2 parents be0d5dc + 8ed44dc
commit e157d14
Show file tree

Hide file tree

Showing 425 changed files with 44,908 additions and 7,512 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
+.vs/
 *.suo
 *.user
 *.userosscache

diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/DreamFactory.AddressBook/App_Package/add_dotnet.dfpkg b/DreamFactory.AddressBook/App_Package/add_dotnet.dfpkg
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     ## files generated by popular Visual Studio add-ons.
     # User-specific files
+    .vs/
     *.suo
     *.user
     *.userosscache
@@ Expand Down @@