Tyler Renelle 3ce2686662 Merge branch 'develop' into switz-inventory ...

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html

2013-03-21 13:51:38 -06:00

..

app

Merge branch 'develop' into switz-inventory

2013-03-21 13:51:38 -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