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
..
css	Merge branch 'master' into video	2013-10-15 14:15:07 -07:00
images	Add option to install locally with firefox	2013-10-11 14:42:08 -07:00
js	Use non-port url for otalk.im ws url	2013-09-17 13:46:53 -07:00
x-manifest.cache	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
x-manifest.webapp	Update desktop integration + jingle	2013-10-14 13:36:19 -07:00