Skip to content

Commit 2a40d6a

Browse files
author
stonebig
committed
resolve git conflict
2 parents f749bf4 + fd53b3e commit 2a40d6a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ <h2 id="releases">Recent Releases </h2>
3333
<li>WinPython <strong>3.4</strong>.4.2Qt5 (*)<a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPythonQt5-3.4.4.2_History.md">Changelog</a>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPythonQt5-3.4.4.2.md">Packages</a> and <a href="https://sourceforge.net/projects/winpython/files/WinPython_3.4/3.4.4.2/">Downloads</a></li>
3434
<li>WinPython <strong>3.5</strong>.1.3 (*) <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.5.1.3_History.md">Changelog</a>, <a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPython-3.5.1.3.md">Packages</a> and <a href="https://sourceforge.net/projects/winpython/files/WinPython_3.5/3.5.1.3/">Downloads</a></li>
3535
</ul>
36+
3637
<p>Release <a href="https://github.com/winpython/winpython/issues/217">2016-01</a> of February 9th, 2016 </p>
3738
<p>Highlights: Jupyter Notebook 4.1, IDLEX, closer integration with pip, full support of '@' in WinPython 3.5 (<a href="https://github.com/winpython/winpython/blob/master/changelogs/WinPythonZero-3.4.4.1.md">Zero</a> Version)</p>
3839
<ul>

0 commit comments

Comments
 (0)