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
..
helpers	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
libraries	Graduate to using stanza.io from npm	2013-09-26 22:52:54 -07:00
models	Merge branch 'master' into video	2013-10-15 14:15:07 -07:00
pages	Make things mostly work	2013-10-15 01:01:49 -07:00
storage	Handle db upgrades, start message archive caching.	2013-09-13 14:36:15 -07:00
templates	Merge branch 'master' into video	2013-10-15 14:15:07 -07:00
views	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
app.js	Save jingle changes	2013-10-15 00:02:45 -07:00
router.js	Add disconnect on logout	2013-09-17 11:19:37 -07:00
templates.js	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00