Kyle Johnson c48b039b15 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	.travis.yml

2014-10-31 12:25:57 -04:00

..

docker

Dockerfile works properly, documentation updated

2014-04-18 12:39:05 -04:00

travis

Use full path to zm_create.sql in bootstrap-zm.sh

2014-06-27 14:13:29 -04:00

bump-version.pl

Added CMakeLists.txt to bump-version.pl

2014-02-06 22:39:12 -05:00

travis.pl

Set execute bit on travis.pl

2014-01-04 14:45:22 -05:00

zm-alarm.pl

use zmDbConnect instead of all the DBI connect stuff

2014-04-09 10:34:58 -04:00