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

404.styl

Adding empty derby project

2012-04-26 22:03:01 -04:00

base.styl

wah my beautiful designery fonts don't work in modals

2013-03-18 14:15:22 -04:00

bootstrap-responsive.styl

Removed edits

2013-01-29 00:22:22 +00:00

reset.styl

didn't need that reset, probably will remove the whole thing once tested for shenanigans

2013-03-18 14:33:05 -04:00

ui.styl

show disconnected above header

2013-02-11 11:05:01 -05:00