Merge branch 'heads/extensions/release/1.5.0' into development · dnnsoftware/Dnn.AdminExperience@3274d0b · GitHub

This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

Commit

Merge branch 'heads/extensions/release/1.5.0' into development

Browse files

Conflicts:
	src/Modules/Content/Dnn.PersonaBar.Pages/Pages.Web/src/components/App.jsx
	src/Modules/Content/Dnn.PersonaBar.Pages/Pages.Web/src/services/pageService.js

Loading branch information

tpluscode committed Sep 6, 2018

2 parents bfe16b2 + ec3dec9 commit 3274d0b