karol pull
merge with master
Merge branch 'master' of https://github.com/OuiShare/OuiShare-Fest into karol
pulling master
Merge branch 'master' of https://github.com/OuiShare/OuiShare-Fest into karol
Merge branch 'master' of https://github.com/OuiShare/OuiShare-Fest into karol
Merge branch 'master' into preprod
Merge branch 'preprod' of https://github.com/OuiShare/OuiShare-Fest into preprod
Merge branch 'cyril-preprod' into preprod
fix fail merge
Merge branch 'cyril-preprod' into preprod
fix fail merge 2
add spaces to satellite event
prepare travel to yellow