Skip to content
Snippets Groups Projects
Commit 008ab67b authored by Jakub Cegan's avatar Jakub Cegan
Browse files

Merge branch 'warden-server-2.2' of homeproj.cesnet.cz:warden 

Conflicts:
	packages/build-server.sh
	src/warden-server/bin/wardenWatchdog.pl
	src/warden-server/doc/CHANGELOG
	src/warden-server/doc/README
	src/warden-server/lib/Warden.pm
	src/warden-server/sh/uninstall.sh
	src/warden-server/sh/update.sh
parents 505ba410 981838c0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1138 additions and 481 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment