projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0300288 b3a2506)
Merge branch 'ipclass-ban' into certified_ipclass-ban
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Mon, 14 Jul 2014 16:29:31 +0000 (18:29 +0200)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Mon, 14 Jul 2014 16:29:31 +0000 (18:29 +0200)
1  2 
web/Obj/brisk.phh patch | diff1 | diff2 | blob | history
web/index.php patch | diff1 | diff2 | blob | history

diff --cc web/Obj/brisk.phh
Simple merge
diff --cc web/index.php
Simple merge
Brisk - briscola chiamata in salsa Ajax: sources.