Mention of Restart supervisor to apply styles changes.
Merge pull request #1320 from camillemonchicourt/patch-6

Mention of Restart supervisor to apply styles changes.
Merge branch 'develop'
Fix 'Information desks' translation in public trek ODT template
increase convertit timeout
Update changelog
Upgrade paperclip/convertit/mapentity
Override prepare_map_images command to skip deleted objects
Merge pull request #1339 from makinacorpus/fix_gtrois

Fix for guillestrois
Merge branch 'master' into develop
Revert "increase convertit timeout"

This reverts commit b579a842eb39e424e9b02f788b0a5688b52fd2c6.
Bump version
Back to development
Create SQL functions and views in right schema (fixes #1343)
Merge pull request #1344 from makinacorpus/sql_create_in_right_schema

Create SQL functions and views in right schema (fixes #1343)
Bump version
Back to development
Fix altimetry sampling for segment with 0 length (rel #1337)