work in progress
Merge branch 'master' into tableau-listing-kid
tableau listing kid en cours
Merge branch 'master' into tableau-listing-kid
ajout schema modif
controller kid work in progress
modif view kid
schema
Merge branch 'master' of github.com:CarolineCC/mashe
Merge branch 'master' of github.com:CarolineCC/mashe
Merge branch 'master' of github.com:CarolineCC/mashe
en cours
ok
conflits réglés
ok
news_filters_active_admin
Merge branch 'master' of github.com:CarolineCC/mashe
Merge branch 'master' into add_admin_functions
Merge pull request #19 from CarolineCC/add_admin_functions

Add admin functions
Display kids in given camp