Gustavo Cortez e24a88dca1 Merge branch 'master' into feature/05-new-design ... Conflicts: js/services/video.js		2014-04-30 16:14:36 -03:00
..
controllers	Merge branch 'master' into feature/05-new-design	2014-04-30 16:14:36 -03:00
models	fix "hello" for authenticated peers	2014-04-30 14:28:33 -03:00
services	Initial page. Signin.	2014-04-30 16:11:55 -03:00
app.js	Merge pull request #197 from colkito/feature/import-backups	2014-04-26 11:31:58 -03:00
directives.js	clean up	2014-04-28 12:03:47 -03:00
filters.js
init.js	fix peers, pubkey WIP	2014-04-08 00:54:38 -03:00
routes.js	fix routes	2014-04-30 00:21:24 -03:00