Jeremy 929c337e8b Merge branch 'unstable' ...

Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py

2015-04-29 16:29:45 -06:00

..

api

Merge branch 'unstable'

2015-04-29 16:29:45 -06:00

__init__.py

Merge branch 'unstable'

2015-04-29 16:29:45 -06:00

index_handler.py

Homepage cleanup

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

upload_handler.py

The upload web page return a 200 in case of error

2015-04-01 21:46:23 +02:00