Files
habitica/public
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
..
2013-03-17 09:45:57 -04:00
2013-02-27 22:19:10 -05:00
2013-02-27 22:19:10 -05:00
2013-02-27 22:19:10 -05:00
2013-02-27 22:19:10 -05:00
2013-02-27 22:19:10 -05:00
2013-03-03 12:15:25 -05:00
2013-03-18 16:48:47 -04:00