gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.normal.rules

]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.normal.rules

author	Vincent Le Gallic <legallic@crans.org>
	Thu, 12 Mar 2015 03:17:01 +0000 (04:17 +0100)
committer	Vincent Le Gallic <legallic@crans.org>
	Thu, 12 Mar 2015 03:17:01 +0000 (04:17 +0100)
commit	74757c6b0aa14166601dc67bc497a75204cacff4
tree	fda2617f72b4fae0eaab0ce96c8277555c47b768	tree \| snapshot
parent	e4d31b97530f0507e2b12c74a1521b9477937c2e	commit \| diff
parent	e51b586142638de82c8d34063b3c01c4923bef21	commit \| diff

Merge branch 'master' into perso

Conflicts:
.ssh/config

Branche perso de configuration de 20-100.