Merge remote-tracking branch 'origin/master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-07-23 11:35:15 +02:00
commit cbc859a03b
6 files changed
+240 -21

No files matched your search

+1 -1
View File
@@ -6,6 +6,6 @@
<ul>
<li><a href="http://community.gns3.com">Community</a></li>
<li><a href="http://api.gns3.net">API documentation</a></li>
<li><a href="/upload">Upload images</a></li>
<li><a href="/upload">Upload images & backup</a></li>
</ul>
{% endblock %}