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

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

author	Johan Cwiklinski <johan@x-tnd.be>
	Wed, 19 Dec 2012 18:28:38 +0000 (19:28 +0100)
committer	Johan Cwiklinski <johan@x-tnd.be>
	Wed, 19 Dec 2012 18:28:38 +0000 (19:28 +0100)
commit	5683eb37bd6df24d2566a28c64b60801f893e191
tree	d88107d672887df33ca1a25c90fb48e6f8c898a6	tree \| snapshot
parent	c502f71017cbc39e86228bd204fc02b36676e0c2	commit \| diff
parent	eb5c16ad0903527faafc228d0c507a637f1f9112	commit \| diff

Merge branch 'hotfix/0.7.2.8' into develop

Conflicts:
galette/includes/galette.inc.php
galette/includes/smarty.inc.php
galette/lib/Galette/Repository/Members.php

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

RSS Atom

galette/ajouter_contribution.php	diff1 \|	diff2 \|	blob \| history
galette/ajouter_transaction.php	diff1 \|	diff2 \|	blob \| history
galette/includes/smarty.inc.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Entity/Adherent.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Entity/Group.php	diff1 \|	diff2 \|	blob \| history
galette/lib/Galette/Repository/Members.php	diff1 \|	diff2 \|	blob \| history
galette/templates/default/ajouter_contribution.tpl	diff1 \|	diff2 \|	blob \| history
galette/templates/default/gestion_adherents.tpl	diff1 \|	diff2 \|	blob \| history