Julien Duponchelle d8fb33dba2 Fix merge conflict

2015-06-03 18:58:17 +02:00

..

cert_utils

Add CN support to cert as command line arg

2014-09-08 22:07:33 -06:00

handlers

Merge branch 'master' into unstable

2015-05-28 12:04:01 +02:00

modules

Fix merge conflict

2015-06-03 18:58:17 +02:00

schemas

ACPI shutdown support for Qemu VMs.

2015-06-02 22:33:38 -06:00

templates

Homepage cleanup

2015-03-27 10:04:16 +01:00

utils

Get server resource independant of working directory

2015-05-28 13:24:45 +02:00

web

Merge branch 'master' into unstable

2015-06-03 18:34:46 +02:00

__init__.py

New base server.

2015-01-13 17:05:26 -07:00

config.py

Turn off configuration parser interpolation

2015-05-05 11:53:33 +02:00

crash_report.py

Merge branch 'master' into unstable

2015-06-03 18:34:46 +02:00

main.py

Merge branch 'master' into unstable

2015-05-28 12:04:01 +02:00

run.py

Merge branch 'master' into unstable

2015-05-08 14:45:07 +02:00

server.py

Force closing the event loop to avoid warning with Python 3.4.3

2015-05-05 11:33:47 +02:00

version.py

1.3.5dev1

2015-06-02 20:05:31 +02:00