]> gitweb.pimeys.fr Git - bots/salesman.git/commitdiff
projects / bots / salesman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc61e65 d446031)
remove merge conflict
authorMaxime Bombar <bombar@crans.org>
Tue, 20 Jun 2017 07:16:59 +0000 (09:16 +0200)
committerMaxime Bombar <bombar@crans.org>
Tue, 20 Jun 2017 07:16:59 +0000 (09:16 +0200)
1  2 
questions.txt patch | diff1 | diff2 | blob | history

diff --cc questions.txt
Simple merge
Bot IRC pour jouer avec les capitales des pays (backup sur pimeys)