Merge branch 'varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional' of https://brutus.artica.lan:8081/artica/pandorafms into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional

Browse Source

Conflicts resolved:
	pandora_console/extras/mr/9.sql

...

This commit is contained in:

Alejandro Gallardo Escobar 2017-11-16 10:10:37 +01:00

parent f2ad76636c 534140c795

commit 23a9e4f5ac

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available