Merge branch 'release/1.2.0' into develop

sergei-maertens · Apr 8, 2016 · 93de16e · 93de16e
2 parents 2d670c7 + 6874abe
commit 93de16e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+1.2.0
+-----
+
+* Added a staticifles finder: ``systemjs.finders.SystemFinder``. Thanks to
+  https://github.com/wkevina for the report that lead to this.
+
+* Added proper documentation on readthedocs.org
+
+
 1.1.1
 -----
 

diff --git a/systemjs/__init__.py b/systemjs/__init__.py
@@ -7,7 +7,7 @@
 import subprocess
 
 
-VERSION = (1, 1, 2, 'final', 0)
+VERSION = (1, 2, 0, 'final', 0)
 
 
 default_app_config = 'systemjs.apps.SystemJSConfig'