pengdi@zoniot.com 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 rokov pred
..
java 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 rokov pred
resources 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. 4 rokov pred
webapp cc45955659 water-iot 4 rokov pred