grossmj 21a1800edc Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/version.py

2018-04-28 19:41:12 +07:00

..

api

Merge branch '2.1' into 2.2

2018-04-28 19:41:12 +07:00

__init__.py

Move symbol static to /symbols

2016-06-28 18:17:48 +02:00

index_handler.py

Add a clear warning about /upload deprecated

2016-10-18 22:57:02 +02:00