Julien Fastré dae040ebfb Merge branch 'master' into fork/boriswa/1849-1848-1920-1921-fix-bugs ...

# Conflicts:
#	src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

2025-12-12 10:11:31 +01:00

..

_static

Resolve "Partout, renommer "cercle" en "service" et "centre" en "territoire""

2025-11-04 15:25:10 +00:00

_static_sources

prepare for merging doc into mono-repository

2021-03-25 17:09:49 +01:00

bundles

Resolve "Documentation: utiliser mkdocs (avec l'extension mkdocs-material) plutôt que Sphinx"

2025-12-05 11:33:14 +00:00

development

Merge branch 'master' into fork/boriswa/1849-1848-1920-1921-fix-bugs

2025-12-12 10:11:31 +01:00

installation

Resolve "Documentation: utiliser mkdocs (avec l'extension mkdocs-material) plutôt que Sphinx"

2025-12-05 11:33:14 +00:00

conf.py

fix readthedocs compilation

2021-03-25 18:05:29 +01:00

index.md

Resolve "Documentation: utiliser mkdocs (avec l'extension mkdocs-material) plutôt que Sphinx"

2025-12-05 11:33:14 +00:00