2.2/develop : french translations
Core Field Type Choice french translation
Update database.php.bak
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge pull request #2673 from khalil-tabbal/2.2/develop

2.2/develop : french translations
Merge pull request #2669 from RaveX/patch-1

Update database.php.bak
Merge git://github.com/pyrocms/pyrocms into 2.2/develop