2.2/develop : blog module : small french translation
2.2/develop : french translations : blog plugin self documentation
Merge branch '2.2/develop' of https://github.com/pyrocms/pyrocms into 2.2/develop
Fixes to the base theme
Adding the timespan function to the helper plugin
Merge branch '2.2/develop' of github.com:khalil-tabbal/pyrocms into 2.2/develop
Merge branch '2.2/develop' of https://github.com/pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:khalil-tabbal/pyrocms into 2.2/develop
French translations for Streams Library
french translations for module pages
french translations for module maintenance
Fix bug where activation email sent upon registration even when Setting is "No activation"
Fixes #2585. Installer showed warning for undefined variable.
Merge pull request #2586 from jerel/installer-bugfix

Fixes #2585. Installer showed warning for undefined variable.
Merge pull request #2577 from ultimateprogramer/2.2/develop

Fixes to the base theme
Merge pull request #2581 from khalil-tabbal/2.2/develop

2.2/develop: french translations
Adding the ability to overload the page template.

This was in 2.1.5 but this ability was lost in 2.2.

Fixes #2589
You need the plural key for some reason for this to work correctly.
Fixed a couple tiny issues with how keywords were presented
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop