Lance Stout 71e342a0a2 Merge branch 'master' into video ...

Conflicts:
	public/css/otalk.css
	public/x-manifest.cache

2013-10-15 14:15:07 -07:00

..

app

Merge branch 'master' into video

2013-10-15 14:15:07 -07:00

_mixins.styl

[ux] enlarge avatars and place unread count in the avatar. #2

2013-09-25 09:18:37 +02:00

_reset.styl

Refactor everything to use stylus

2013-09-16 02:19:07 -07:00

_variables.styl

[ux] finalize roster

2013-09-23 20:06:42 +02:00

otalk.css

Merge branch 'master' into video

2013-10-15 14:15:07 -07:00

otalk.styl

starting to add active calls, collection and start of UI

2013-10-15 12:15:25 -07:00