Commit 310aa4f2 authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.0' into 1.1

* 1.0:
  prepared the 1.0.2 release
  updated CHANGELOG

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php
parents c2d0d2ca 89d5ed3c
...@@ -6,6 +6,11 @@ Changelog ...@@ -6,6 +6,11 @@ Changelog
* n/a * n/a
1.0.2 (2013-10-30)
------------------
* Fixed SecurityServiceProvider to use null as a fake controller so that routes can be dumped
1.1.1 (2013-10-11) 1.1.1 (2013-10-11)
------------------ ------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment