Compare commits
merge into: Yaltik:master
Yaltik:master
Yaltik:stable
Yaltik:2
youssef:ressources_gestion_vacances_conges
youssef:Compte_CA_acces_en_lecture
youssef:changer_filtre_evenements_en_cours_venir
youssef:filtre_saison_par_defaut_sur_activites
youssef:master
youssef:analyses_pour_la_ville
youssef:Mailing_actions
youssef:territoires_rues_gerer_numeros
youssef:activites_inscription_par_creneau_interne
youssef:facture_pour_mineur_activite
youssef:ajout_territoire_sur_famille
youssef:contact_ameliorations_diverses
youssef:Historique_des_donnees_CAF
youssef:territoires_ameliorations
youssef:facture_pour_mineur
youssef:facture_unique_par_saison
youssef:ameliorations_representants_legaux
youssef:famille_monoparental
youssef:activites_reservees_aux_adherents
youssef:Activites_gratuites_libres
youssef:Categories_sociopro
youssef:Duplication_acitvite
youssef:Adhesion_familiale
youssef:Resource_spelling_mistakes
youssef:test_vs
youssef:depot_de_cheque
youssef:account_check_deposit
youssef:activity_report
youssef:Creation_rapide_reservation
youssef:golem_resource_pack
youssef:resource_report
youssef:timing_invoice
youssef:product_list_filtered
youssef:youssef_activity
youssef:Add_reservation_to_existing_invoice
youssef:golem_resource_option
youssef:golem_precreation_member
youssef:golem_resource_account
youssef:resource_calendar_improvement
youssef:youssef_multidays_2
youssef:golem_multidays_reservation
youssef:youssef_resource
youssef:youssef_queue
youssef:stable
youssef:2
pull from: youssef:ressources_gestion_vacances_conges
youssef:ressources_gestion_vacances_conges
youssef:Compte_CA_acces_en_lecture
youssef:changer_filtre_evenements_en_cours_venir
youssef:filtre_saison_par_defaut_sur_activites
youssef:master
youssef:analyses_pour_la_ville
youssef:Mailing_actions
youssef:territoires_rues_gerer_numeros
youssef:activites_inscription_par_creneau_interne
youssef:facture_pour_mineur_activite
youssef:ajout_territoire_sur_famille
youssef:contact_ameliorations_diverses
youssef:Historique_des_donnees_CAF
youssef:territoires_ameliorations
youssef:facture_pour_mineur
youssef:facture_unique_par_saison
youssef:ameliorations_representants_legaux
youssef:famille_monoparental
youssef:activites_reservees_aux_adherents
youssef:Activites_gratuites_libres
youssef:Categories_sociopro
youssef:Duplication_acitvite
youssef:Adhesion_familiale
youssef:Resource_spelling_mistakes
youssef:test_vs
youssef:depot_de_cheque
youssef:account_check_deposit
youssef:activity_report
youssef:Creation_rapide_reservation
youssef:golem_resource_pack
youssef:resource_report
youssef:timing_invoice
youssef:product_list_filtered
youssef:youssef_activity
youssef:Add_reservation_to_existing_invoice
youssef:golem_resource_option
youssef:golem_precreation_member
youssef:golem_resource_account
youssef:resource_calendar_improvement
youssef:youssef_multidays_2
youssef:golem_multidays_reservation
youssef:youssef_resource
youssef:youssef_queue
youssef:stable
youssef:2
Yaltik:master
Yaltik:stable
Yaltik:2
A pull request between these branches already exists: Yaltik/golem#48