Files · 325b8bbafb916d7d79b6d8cf860a910e2a4619cd · Fukász Rómeó Ervin / cloud

Merge branch 'master' into feature-base-template · 325b8bba

Conflicts:
	circle/dashboard/templates/dashboard/template-list.html
	circle/dashboard/templates/dashboard/vm-detail/home.html
	circle/dashboard/views.py

committed Jul 14, 2014

325b8bba

Name	Last commit	Last Update
circle		Loading commit data...
docs		Loading commit data...
miscellaneous		Loading commit data...
requirements		Loading commit data...
.gitignore		Loading commit data...
CONTRIBUTORS.txt		Loading commit data...
COPYING		Loading commit data...
LICENSE.txt		Loading commit data...
README.rst		Loading commit data...
requirements.txt		Loading commit data...

README.rst