Merge remote-tracking branch 'origin/dev_campaign' into dev
Conflicts: core/templates/base.html core/templates/core/blocks/navigation.haml memopol_representatives/templates/memopol_representatives/view.html memopol_representatives/views.py
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 3 ajouts, 0 suppression.gitignore
- core/static/css/base.css 1 ajout, 1 suppressioncore/static/css/base.css
- core/templates/base.html 2 ajouts, 2 suppressionscore/templates/base.html
- core/templates/core/blocks/header.haml 1 ajout, 2 suppressionscore/templates/core/blocks/header.haml
- core/templates/core/home.haml 4 ajouts, 2 suppressionscore/templates/core/home.haml
- core/views.py 1 ajout, 1 suppressioncore/views.py
- memopol_representatives/templates/memopol_representatives/view.html 15 ajouts, 4 suppressions...presentatives/templates/memopol_representatives/view.html
- memopol_representatives/urls.py 1 ajout, 0 suppressionmemopol_representatives/urls.py
- memopol_representatives/views.py 38 ajouts, 1 suppressionmemopol_representatives/views.py
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter