3cee6a133d
Conflicts: db/zm_update-1.27.1.sql web/lang/nl_nl.php |
||
---|---|---|
.. | ||
Makefile.am | ||
alarm.php | ||
control.php | ||
event.php | ||
log.php | ||
status.php | ||
stream.php | ||
zone.php |
3cee6a133d
Conflicts: db/zm_update-1.27.1.sql web/lang/nl_nl.php |
||
---|---|---|
.. | ||
Makefile.am | ||
alarm.php | ||
control.php | ||
event.php | ||
log.php | ||
status.php | ||
stream.php | ||
zone.php |