Tyler Renelle fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks ... Conflicts: styles/app/index.styl styles/app/tasks.styl views/app/alerts.html views/app/avatar.html views/app/header.html views/app/index.html Merge branch 'develop' into zakkain-ui-tweaks Conflicts: styles/app/index.styl styles/app/tasks.styl views/app/alerts.html views/app/avatar.html views/app/header.html views/app/index.html by popular demand, we're dropping the crosshatched square and going blank Conflicts: styles/app/tasks.styl		2013-03-21 12:36:05 -06:00
..
app	Merge branch 'develop' into zakkain-ui-tweaks	2013-03-21 12:36:05 -06:00
static	try some protocol-agnostics to fix homepage css	2013-03-21 11:23:46 -06:00
404.html	Adding empty derby project	2012-04-26 22:03:01 -04:00