merged branch JEDIBC/master (PR #556)
merged branch JEDIBC/master (PR #556)

Commits
-------

3bb822e . misspell function _twig_convert_encoding -> twig_convert_encoding

Discussion
----------

misspell function _twig_convert_encoding -> twig_convert_encoding

Located in _twig_escape_js_callback, the function call was misspelled and raised a PHP Fatal error:  Call to undefined function _twig_convert_encoding() in ~/www/project/vendors/Twig/Extension/Core.php on line 585

huang53798584/Twig,markstory/Twig,andrerom/Twig,hhamon/Twig,Tobion/Twig,gamernetwork/Twig,Rvanlaak/Twig,Tobion/Twig,craue/Twig,moufmouf/Twig,jamessingizi/Twig,gencer/Twig,huang53798584/Twig,apishka/templater,hhamon/Twig,peterkokot/Twig,framewr/Twig,apishka/templater,iKwinto/Twig,iKwinto/Twig,robregonm/Twig,znerol/Twig,gamernetwork/Twig,fsw/Twig,iKwinto/Twig,loi-chuanoi/Twig,framewr/Twig,moufmouf/Twig,znerol/Twig,robregonm/Twig,maartendekeizer/Twig,Rvanlaak/Twig,andrerom/Twig,jamessingizi/Twig,hason/Twig,nicolas-grekas/Twig,derickr/Twig,twigphp/Twig,phansys/Twig,bocharsky-bw/Twig,craue/Twig,nicolas-grekas/Twig,Tobion/Twig,gencer/Twig,moltin/Twig,sstok/Twig,fsw/Twig,moltin/Twig,hason/Twig,robregonm/Twig,peterkokot/Twig,bocharsky-bw/Twig,dkarvounaris/Twig,bocharsky-bw/Twig,hason/Twig,Rvanlaak/Twig,sstok/Twig,jamessingizi/Twig,maartendekeizer/Twig,twigphp/Twig,twigphp/Twig,nicolas-grekas/Twig,znerol/Twig,hhamon/Twig,dkarvounaris/Twig,phansys/Twig,dkarvounaris/Twig,huang53798584/Twig,derickr/Twig,moltin/Twig,framewr/Twig,nicolas-grekas/Twig,markstory/Twig,fsw/Twig,nicolas-grekas/Twig,gamernetwork/Twig,moufmouf/Twig,derickr/Twig