ADAM / AIAHTML5

Commit 69432ce58a43492e34dfb437696ddf65f7c87988

Authored by Amrita Vishnoi
2 parents a2aeb1dc 991f51b4

Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA 

# Conflicts:
#	400-SOURCECODE/AIAHTML5.API/Controllers/UnblockUserController.cs
#	400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
#	400-SOURCECODE/AIAHTML5.API/Models/PixelLocator.cs
#	400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
#	400-SOURCECODE/AIAHTML5.API/Properties/AssemblyInfo.cs
#	400-SOURCECODE/AIAHTML5.API/Properties/Settings.Designer.cs
#	400-SOURCECODE/AIAHTML5.API/Properties/Settings.settings
#	400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs
#	400-SOURCECODE/AIAHTML5.API/Web.Debug.config
#	400-SOURCECODE/AIAHTML5.API/Web.Release.config
#	400-SOURCECODE/AIAHTML5.API/index.html
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
Inline Side-by-side
Showing 0 changed files