-
…ttings, basic settings, site account search, site account add, site account edit, user group all screens completed.
-
# Conflicts: # 400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs # 400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx # 400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config # 400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts # 400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts # 400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.routing.module.ts # 400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts # 400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/UpdateProfile/datamodel.ts # 400-SOURCECODE/Admin/src/app/app.component.html # 400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts # 400-SOURCECODE/Admin/src/app/shared/enum.js # 400-SOURCECODE/Admin/src/app/shared/enum.js.map # 400-SOURCECODE/Admin/src/app/shared/global.js # 400-SOURCECODE/Admin/src/app/shared/global.js.map # 400-SOURCECODE/Admin/src/assets/styles/admin-custom.css # 400-SOURCECODE/Admin/src/index.html
