Lukas Macura 2f00b55838 Merge branch '1.1' ...

Conflicts:
	README.md
	lib/zaf.lib.sh

2016-04-15 08:59:36 +02:00

..

cache.lib.sh

Repaired caching

2016-04-13 16:04:00 +02:00

ctrl.lib.sh

Merge branch 'master' of https://github.com/limosek/zaf

2016-04-14 21:38:22 +02:00

os.lib.sh

Switched working flow to trunk

2016-04-12 10:36:17 +02:00

preload.sh

Repaired caching

2016-04-13 16:04:00 +02:00

zaf.lib.sh

Merge branch '1.1'

2016-04-15 08:59:36 +02:00

zaflock

First useable version

2016-03-24 15:46:42 +01:00

zbxapi.lib.sh

Merge branch '1.1'

2016-04-15 08:59:36 +02:00