Skip to content

Conversation

@bsipocz
Copy link
Member

@bsipocz bsipocz commented Oct 13, 2015

Sibling of #4237. Not sure why github thought there were conflicts, there wasn't any issue with the rebase.

@embray - I don't think there's a single fix that only affects master, so if it's easier you may want to backport this and just close the other one. Sorry for the extra noise.

@embray embray added the Docs label Oct 13, 2015
@embray embray added this to the v1.1.0 milestone Oct 13, 2015
embray added a commit that referenced this pull request Oct 21, 2015
@embray embray merged commit 794096e into astropy:master Oct 21, 2015
embray added a commit that referenced this pull request Nov 9, 2015
@eteq
Copy link
Member

eteq commented Nov 9, 2015

backported to v1.1.x in 70c82d9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants