ADAM / AIAHTML5

  • Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA ...
    a822046f 
    Conflicts:
	400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj
	400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/AccountController.cs
	400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/AddLicenseController.cs
	400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
	400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
	400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
	400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SharedModel.cs
	400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs
	400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
	400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
	400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
	400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css
	400-SOURCECODE/Admin/dist/index.html
	400-SOURCECODE/Admin/src/app/app.component.html
	400-SOURCECODE/Admin/src/app/app.component.ts
	400-SOURCECODE/Admin/src/app/app.module.ts
	400-SOURCECODE/Admin/src/app/app.routing.module.ts
	400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.html
	400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.ts
	400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts
	400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.component.html
	400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.component.ts
	400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html
	400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserpassword.component.html
	400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserpassword.component.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/datamodel.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/updateuserprofile.component.html
	400-SOURCECODE/Admin/src/app/components/UserEntity/updateuserprofile.component.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/user.service.ts
	400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
	400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
	400-SOURCECODE/Admin/src/app/shared/Confirm/confirm.component.html
	400-SOURCECODE/Admin/src/app/shared/global.ts
	400-SOURCECODE/Admin/src/index.html
    Nikita Kulshreshtha authored
     
    Browse File »