Merge branch '2015-implementacion-de-grupos-secundarios' of https://192.168.50.5:8081/artica/pandorafms into 2015-implementacion-de-grupos-secundarios

Browse Source

Conflicts:
	pandora_console/pandoradb.sql

...

This commit is contained in:

fermin831 2018-04-03 15:39:40 +02:00

parent e2d61d5794 5ffa396177

commit d36ab81d6c

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