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
..
aux.styl	[ux] small visual tweaks: sizes, placement and cancel button	2013-10-15 12:14:16 -07:00
callbar.styl	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
chat.styl	Merge branch 'master' into video	2013-10-15 14:15:07 -07:00
connectionStatus.styl	[ux] make connection status a modal	2013-09-24 12:45:31 +02:00
forms.styl	[ux] small visual tweaks: sizes, placement and cancel button	2013-10-15 12:14:16 -07:00
layout.styl	[ux] increase widths to fit all info in roster	2013-09-27 09:39:31 +02:00
roster.styl	Merge branch 'master' into video	2013-10-15 14:15:07 -07:00
settings.styl	[ux] small visual tweaks: sizes, placement and cancel button	2013-10-15 12:14:16 -07:00