circle/dashboard/templates/dashboard · 7a501d0ab915634c1d013c35f0a798c4b0398149 · Fukász Rómeó Ervin / cloud

Merge remote-tracking branch 'origin/master' into feature-node-traits

Conflicts:
	circle/dashboard/forms.py
	circle/dashboard/urls.py
	circle/dashboard/views.py

committed Mar 13, 2014

7a501d0a

Name	Last commit	Last Update
..
confirm		Loading commit data...
group-list		Loading commit data...
node-detail		Loading commit data...
node-list		Loading commit data...
notifications		Loading commit data...
template-list		Loading commit data...
vm-detail		Loading commit data...
vm-list		Loading commit data...
_disk-list-element.html		Loading commit data...
_notifications-timeline.html		Loading commit data...
_vm-create-1.html		Loading commit data...
_vm-create-2.html		Loading commit data...
_vm-migrate.html		Loading commit data...
base.html		Loading commit data...
group-detail.html		Loading commit data...
group-list.html		Loading commit data...
index-files.html		Loading commit data...
index-groups.html		Loading commit data...
index-nodes.html		Loading commit data...
index-templates.html		Loading commit data...
index-vm.html		Loading commit data...
index.html		Loading commit data...
lease-create.html		Loading commit data...
lease-edit.html		Loading commit data...
modal-wrapper.html		Loading commit data...
node-add-trait.html		Loading commit data...
node-create.html		Loading commit data...
node-detail.html		Loading commit data...
node-list.html		Loading commit data...
nojs-wrapper.html		Loading commit data...
notifications.html		Loading commit data...
template-create.html		Loading commit data...
template-edit.html		Loading commit data...
template-list.html		Loading commit data...
test_message.txt		Loading commit data...
vm-detail.html		Loading commit data...
vm-list.html		Loading commit data...