-
…TML5 into AIAHTML_developWithCB Conflicts: 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js CurriculamBuilder_and_AdamImages_code
-
Issue in search layout and annotation toolbar is not enabled
-
2. Corrected json by verfied data from xml
-
save function call was missing during previous merge. added that
-
Added json and images for lymphatic questions
-
were not valid. now commiting valid json files for language