git.agnieray.net Git - galette.git/commit

]> git.agnieray.net Git - galette.git/commit - bin/release

author	Johan Cwiklinski <johan@x-tnd.be>
	Sat, 22 Dec 2012 11:09:54 +0000 (12:09 +0100)
committer	Johan Cwiklinski <johan@x-tnd.be>
	Sat, 22 Dec 2012 11:09:54 +0000 (12:09 +0100)
commit	2a20a6a8d67cff491cc3fa60ef2646c93a9de518
tree	fad444b9c881bfac9aa8a61ef539b6982b7033b0	tree \| snapshot
parent	9fabc351bf968f91d5b9ccd51247a3433a8f8767	commit \| diff
parent	2d01bf65e27fd83322a930365245069798b409c4	commit \| diff

Merge branch 'hotfix/0.7.2.9' into develop

Conflicts:
galette/includes/galette.inc.php
galette/lib/Galette/Entity/Adherent.php

Galette membership management web application towards non profit (personal repository) | https://galette.eu

galette/ajouter_contribution.php	diff1 \|	diff2 \|	blob \| history
galette/carte_adherent.php	diff1 \|	diff2 \|	blob \| history
galette/includes/galette.inc.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Core/GaletteMail.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Core/Mailing.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Entity/Adherent.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Entity/Contribution.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Repository/Members.php	diff1 \|	diff2 \|	blob \| history
galette/mailing_adherents.php	diff1 \|	diff2 \|	blob \| history