[interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
Gert van der Spoel
interchange-cvs at icdevgroup.org
Mon Apr 11 11:02:47 UTC 2011
commit 60a4731e5a5db9504fd2448eee1be46b674173b0
Merge: 613b1fc... be63373...
Author: Gert van der Spoel <gert at 3edge.com>
Date: Mon Apr 11 12:45:57 2011 +0200
Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
code/Widget/uploadhelper.widget | 7 ++-
dist/lib/UI/pages/admin/upload_file.html | 5 +-
dist/lib/UI/profiles/process_filter | 6 ++-
dist/lib/UI/vars/UI_STD_HEAD | 1 +
lib/Vend/Order.pm | 1 +
lib/Vend/Server.pm | 86 ++++++++++++++++-------
lib/Vend/UserDB.pm | 109 +++++++++++++++++++++++-------
7 files changed, 159 insertions(+), 56 deletions(-)
---
More information about the interchange-cvs
mailing list