Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-09-04 17:47:57 +02:00
commit b8423ed6ff

View file

@ -43,7 +43,7 @@ phpbb_convert_intro:
start_new: 0 start_new: 0
phpbb_convert_settings: phpbb_convert_settings:
path: /convert/settings/{convertor} path: /convert/settings/{converter}
defaults: defaults:
_controller: phpbb.installer.controller.convert:settings _controller: phpbb.installer.controller.convert:settings
requirements: requirements: