Merge branch 'release/0.1.15'

miyakogi · Jun 30, 2018 · fc7b644 · fc7b644
2 parents 48d0083 + 6821641
commit fc7b644
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,10 @@
 
 (next version)
 
+### Version 0.1.15 (2018-06-30)
+
+* Support Sphinx's doc/ref directives for relative links ([#16](https://github.com/miyakogi/m2r/pull/16))
+
 ### Version 0.1.14 (2018-03-22)
 
 * Implement markdown link with title

diff --git a/docs/conf.py b/docs/conf.py
@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.14'
+version = '0.1.15'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.14'
+release = '0.1.15'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -144,7 +144,7 @@
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
-#html_title = 'M2R v0.1.14'
+#html_title = 'M2R v0.1.15'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None

diff --git a/m2r.py b/m2r.py
@@ -21,7 +21,7 @@
     _open = open
     from urllib.parse import urlparse
 
-__version__ = '0.1.14'
+__version__ = '0.1.15'
 _is_sphinx = False
 prolog = '''\
 .. role:: raw-html-m2r(raw)

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 
 setup(
     name='m2r',
-    version='0.1.14',
+    version='0.1.15',
     description='Markdown and reStructuredText in a single file.',
     long_description=readme,
     author='Hiroyuki Takagi',