tree d974aec422179aa7dd048460bbecdfb46c3c0bf5
parent 1f5243c097903cbd6b00175e4d3019d41101b664
parent e0ab3f583c2d261ae254b6d3eff144b2237b851b
author Vlasta Mikeš <v.mikes@tcpisek.cz> 1445848751 +0100
committer Vlasta Mikeš <v.mikes@tcpisek.cz> 1445848751 +0100

Merge branch 'feature/monitoring' into 'master'

server is still pip

See merge request !8