Skip to content

Commit

Permalink
Merge branch 'dev' (#4545)
Browse files Browse the repository at this point in the history
  • Loading branch information
joelverhagen committed Aug 10, 2017
2 parents 1184ad8 + 0fddd36 commit f44a86f
Show file tree
Hide file tree
Showing 614 changed files with 139,929 additions and 6,913 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ $RECYCLE.BIN/
.DS_Store

# NuGetGallery Specific Ignores
src/NuGetGallery/App_Data/**
src/NuGetGallery/App_Data/*
!src/NuGetGallery/App_Data/Files/
src/NuGetGallery/App_Data/Files/*
!src/NuGetGallery/App_Data/Files/Content/
!src/NuGetGallery/Views/Packages/
!src/NuGetGallery/Branding/Views/Packages/

Expand All @@ -180,6 +183,5 @@ Results.?.xml
# Reason: The localtest.me setting needs to be configured in the <sites>-section.
# See ReadMe.md for more information
.vs/config/applicationhost.config
src/NuGetGallery/App_Data/Files/auditing/
artifacts/
.vs
67 changes: 0 additions & 67 deletions content/DEV/Home.html

This file was deleted.

43 changes: 21 additions & 22 deletions content/DEV/Privacy-Policy.md

Large diffs are not rendered by default.

64 changes: 64 additions & 0 deletions content/DEV/Team.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[
"AndriySvyryd",
"DoRonMotter",
"Haacked",
"MeniZalzman",
"RanjiniM",
"TimBarham",
"TimLovellSmith",
"agr",
"alpaix",
"anangaur",
"anurse",
"bhuvak",
"chenriksson",
"claycompton",
"cristinamanum",
"csharpfritz",
"danliu",
"davidebbo",
"davidfowl",
"deepakaravindr",
"deepakverma",
"diverdan92",
"dotnetjunky",
"drewgillies",
"dtivel",
"emgarten",
"ericstj",
"feiling",
"half-ogre",
"harikmenon",
"harshgMSFT",
"howarddierking",
"jainaashish",
"jasonmalinowski",
"jbagga",
"jeffhandley",
"joelverhagen",
"johnataylor",
"jonwchu",
"karann-msft",
"kzu",
"loic-sharma",
"maartenba",
"mishra14",
"mrward",
"murilogr",
"nkolev92",
"osbornm",
"pranavkm",
"pspill",
"rohit21agrawal",
"rrelyea",
"ryuyu",
"sbanni",
"sblom",
"scottbommarito",
"shishirx34",
"skofman1",
"xavierdecoster",
"yishaigalatzer",
"yugangw-msft",
"zhili1208"
]
Loading

0 comments on commit f44a86f

Please sign in to comment.