projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e23d21c 4a5e7d4)
Merge branch 'xorg/f/xnet-accounts' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 21 Mar 2011 12:25:02 +0000 (13:25 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 21 Mar 2011 12:25:02 +0000 (13:25 +0100)
1  2 
classes/userfilter/conditions.inc.php patch | diff1 | diff2 | blob | history

diff --cc classes/userfilter/conditions.inc.php
Simple merge
plat/al