Tyler Renelle be305f918e Merge branch 'develop' ...

Conflicts:
	src/server/api.coffee
	views/static/head.html
	views/static/privacy.html
	views/static/terms.html

2013-03-21 10:35:00 -06:00

..

app

Merge branch 'develop'

2013-03-21 10:35:00 -06:00

404.styl

Adding empty derby project

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

base.styl

Move all of habits.styl into index.styl, conslidate

2012-06-26 08:41:28 -04:00

bootstrap-responsive.styl

Removed edits

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

reset.styl

Adding empty derby project

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

ui.styl

show disconnected above header

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