projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40b5a72 7c52d14)
Merge remote-tracking branch 'origin/master' into wr-on-ws
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Sat, 11 Apr 2020 07:23:30 +0000 (09:23 +0200)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Sat, 11 Apr 2020 07:23:30 +0000 (09:23 +0200)
Conflicts:
web/Obj/brisk.phh

1  2 
web/Obj/brisk.phh patch | diff1 | diff2 | blob | history

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