summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2018-07-13 22:13:17 -0500
committermattip <matti.picus@gmail.com>2018-07-13 22:13:17 -0500
commitdc0ab8c7af69bbd3c91c5493b31e2ae001d4a0cb (patch)
tree2997eb88fe147fe66806a67c58ea40f24b248f0d
parent7598437d7547844e860a7dc4626294f6e4107aad (diff)
downloadnumpy-dc0ab8c7af69bbd3c91c5493b31e2ae001d4a0cb.tar.gz
NEP: accept nep 0015
-rw-r--r--doc/neps/nep-0015-merge-multiarray-umath.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/neps/nep-0015-merge-multiarray-umath.rst b/doc/neps/nep-0015-merge-multiarray-umath.rst
index 5e605a04f..7c1f5faf8 100644
--- a/doc/neps/nep-0015-merge-multiarray-umath.rst
+++ b/doc/neps/nep-0015-merge-multiarray-umath.rst
@@ -3,10 +3,10 @@ NEP 15 — Merging multiarray and umath
=====================================
:Author: Nathaniel J. Smith <njs@pobox.com>
-:Status: Draft
+:Status: Accepted
:Type: Standards Track
:Created: 2018-02-22
-
+:Resolution: https://mail.python.org/pipermail/numpy-discussion/2018-June/078345.html
Abstract
--------