Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-27 11:16:26 -07:00
commit 701e5af5a2
1 changed files with 2 additions and 1 deletions

View File

@ -42,6 +42,7 @@
"win7-x64": { },
"win7-x86": { },
"osx.10.10-x64": { },
"ubuntu.14.04-x64": { }
"ubuntu.14.04-x64": { },
"ubuntu.15.04-x64": { }
}
}