Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mergeback v1.10.x #2154

Merged
merged 2 commits into from
Sep 28, 2016
Merged

Mergeback v1.10.x #2154

merged 2 commits into from
Sep 28, 2016

Conversation

ajdawson
Copy link
Member

Merge changes from v1.10.x back into master, in particular this brings changes from #2144.

djkirkham and others added 2 commits September 28, 2016 09:26
* Add attributes to mock object

* Change datetime.datetime to netcdftime.datetime

* Fix license header
@marqh
Copy link
Member

marqh commented Sep 28, 2016

grand, thank you AJ

@marqh marqh merged commit f53fc6f into SciTools:master Sep 28, 2016
@QuLogic QuLogic added this to the v2.0 milestone Sep 28, 2016
@QuLogic QuLogic modified the milestones: v2.0, v1.11 Oct 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants