Enrique Martin ea86205b36 Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan' ... Conflicts: pandora_server/conf/pandora_server.conf.new		2019-12-24 10:49:44 +01:00
..
pandora_server.conf.new	Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan'	2019-12-24 10:49:44 +01:00
pandora_server.conf.windows	Added rcmd_timeout_bin token in pandora_server.conf by default	2019-12-24 10:43:08 +01:00
tentacle_server.conf.new	Add menu omnishell	2019-11-21 18:21:46 +01:00