-
- Downloads
Merge remote-tracking branch 'remotes/origin/dev' into Issue/2184-kpiGeneratorProject
# Conflicts: # src/KPI Generator/Utils/Organization.cs
Showing
- src/KPI Generator/Reportings/Resource/ResourceReporting.cs 140 additions, 8 deletionssrc/KPI Generator/Reportings/Resource/ResourceReporting.cs
- src/KPI Generator/Reportings/Resource/ReturnObject.cs 16 additions, 1 deletionsrc/KPI Generator/Reportings/Resource/ReturnObject.cs
- src/KPI Generator/Reportings/User/ReturnObject.cs 0 additions, 1 deletionsrc/KPI Generator/Reportings/User/ReturnObject.cs
- src/KPI Generator/Reportings/User/UserReporting.cs 1 addition, 1 deletionsrc/KPI Generator/Reportings/User/UserReporting.cs
- src/KPI Generator/Utils/Organization.cs 1 addition, 5 deletionssrc/KPI Generator/Utils/Organization.cs
Please register or sign in to comment