pengdi@zoniot.com d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. пре 4 година
..
JobResult.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. пре 4 година
JobTask.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. пре 4 година
MeasuringData.class 5383c2c971 Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. пре 4 година
MeterReadRecord.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. пре 4 година
WaterMeter.class d16aa8a7db Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. пре 4 година