-
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj # 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html
-
AA search and show all button swap
-
added code for site url if site url user goes to Flex CB/anatomyTest via AIAHTML5