circle/templates/registration · c2394baa7fccb4345c99b4b0b1133377bdce485e · Gutyán Gábor / circlestack

Merge branch 'master' into feature-pipeline · 8e1635ef

Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/static/dashboard/vm-details.js
	circle/dashboard/templates/base.html
	circle/dashboard/templates/dashboard/index-vm.html

committed Sep 16, 2014

8e1635ef

Name	Last commit	Last Update
..
base.html		Loading commit data...
login.html		Loading commit data...
password_reset_complete.html		Loading commit data...
password_reset_confirm.html		Loading commit data...
password_reset_done.html		Loading commit data...
password_reset_form.html		Loading commit data...