Merge branch 'release' into dev

2016-04-28 21:08:55 -07:00 · 2016-04-28 21:08:55 -07:00 · d9d7994af8
parent 9499e3ee6d 063a6c7c6a
commit d9d7994af8
1 changed files with 1 additions and 0 deletions
--- a/test/ServerComparison.TestSites.Standalone/project.json
+++ b/test/ServerComparison.TestSites.Standalone/project.json
@ -43,6 +43,7 @@
    "win7-x64": { },
    "win7-x86": { },
    "osx.10.10-x64": { },
+    "osx.10.11-x64": { },
    "ubuntu.14.04-x64": { },
    "ubuntu.15.04-x64": { }
  }