Mario Colque 74f7271310 fix conflicts		2014-04-20 17:18:20 -03:00
..
controllers	fix conflicts	2014-04-20 17:18:20 -03:00
models	Merge pull request #100 from matiu/feature/ux7	2014-04-20 16:52:53 -03:00
services	fix conflicts	2014-04-20 17:18:20 -03:00
app.js	Merge branch 'master' into feature/socket-io-support	2014-04-17 11:58:11 -03:00
config.template.js	Merge remote-tracking branch 'colkito/fix/remove-localhost-host'	2014-04-20 15:48:49 -03:00
directives.js
filters.js
init.js	fix peers, pubkey WIP	2014-04-08 00:54:38 -03:00
routes.js	refactory of the socket service	2014-04-18 19:08:01 -03:00