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
..
includes	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
misc	Add appcache support	2013-10-11 22:39:30 -07:00
pages	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
body.jade	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
head.jade	[ux] add typography.com fonts	2013-09-19 13:29:42 +02:00
main.html	[ux] small visual tweaks: sizes, placement and cancel button	2013-10-15 12:14:16 -07:00