projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14986dd 2dc23b5)
Merge branch 'master', remote branch 'origin' into auto-maintenance
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Thu, 23 Jan 2014 17:35:47 +0000 (18:35 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Thu, 23 Jan 2014 17:35:47 +0000 (18:35 +0100)
1  2 
web/Obj/user.phh patch | diff1 | diff2 | blob | history

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