Fix #255 : increase article toolbar height if necessary
Merge pull request #261 from NumEricR/toolbar-height

Fix #255 : increase article toolbar height if necessary
Merge pull request #264 from jcsaaddupuy/dev

Embeding jquery
Added support for custom ssl port
Fixed typo
missing }
Merge branch 'dev' into custom_port
Added support for custom SSL port
delete href
bug fix #266: make installation steps easier
bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating
what this f* F?
Merge remote branch 'upstream/dev' into dev

Conflicts:
	themes/default/_head.twig
bug fix #215: change language from config screen
bug fix: changing password was buggy
Merge pull request #272 from jcsaaddupuy/custom_ssl_port

Custom ssl port
Added Roboto font from https://themes.googleusercontent.com/static/fonts/roboto/v9/2UX7WLTfW3W8TclTUvlFyQ.woff
Removed google font link
Added font-face linked to local font
Merge branch 'dev' into emded-dependencies