The branch, tmp has been updated via 7bbd55cb27c9fe59ebe38c8938676b3cca068f75 (commit) from 23f9762174258d904af10acd9f91c195c0f17881 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index f6cbfe7..a9c79ad 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -27,7 +27,7 @@ import argparse import socket try: - import x2gobroker + import x2gobroker.defaults except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) import x2gobroker.defaults @@ -61,7 +61,7 @@ if __name__ == "__main__": # import classes serving the different web.py URLs from x2gobroker.web.plain import * #from x2gobroker.web.json import * -from x2gobroker.web.html import * +#from x2gobroker.web.html import * # define the web.py URLs urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain', hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).