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

Conflicts:
	static/js/app.js
This commit is contained in:
Jake Moshenko 2014-05-07 15:32:27 -04:00
commit 73a0cc791b
48 changed files with 772 additions and 386 deletions

View file

@ -698,6 +698,10 @@ i.toggle-icon:hover {
background-color: #ddd;
}
.phase-icon.pulling {
background-color: #cab442;
}
.phase-icon.building {
background-color: #f0ad4e;
}