cherry-pick changes from master

This commit is contained in:
Jonas Helfer 2016-07-05 15:01:49 -07:00
parent 658a15059a
commit 07495a163e
2 changed files with 16 additions and 1 deletions

View file

@ -0,0 +1,15 @@
# Changelog
### vNEXT
### v0.1.5
* BUG: Fixed a spelling error with `tracer.submit()` from PR [#26]((https://github.com/apollostack/apollo-server/pull/26)
in PR [#31](https://github.com/apollostack/apollo-server/pull/31)
### v.0.1.4
* BUG: Fixed a bug with tracer mocks that would throw a TypeError when using Ava [#26](https://github.com/apollostack/apollo-server/pull/26)
### v0.1.3
* Updated graphql dependency to 0.6.0

View file

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2016 Apollo
Copyright (c) 2016 Meteor Development Group, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal