habitica/views
Tyler Renelle a3003a758d Merge branch 'tags' into develop
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/settings.html
	views/app/tasks.html
2013-05-06 14:01:43 +01:00
..
app Merge branch 'tags' into develop 2013-05-06 14:01:43 +01:00
static redirect about, team, extensions to the community site. remove header 2013-04-03 17:15:28 -04:00
404.html Adding empty derby project 2012-04-26 22:03:01 -04:00