 Sebastiaan Janssen
|
efa0659742
|
Merge branch 'refs/heads/master' into move-masterpages-to-views
# Conflicts:
# .gitignore
# OurUmbraco.Client/package.json
# OurUmbraco.Site/config/Dashboard.config
# OurUmbraco.Site/masterpages/Release.master
# OurUmbraco.Site/usercontrols/Deli/Package/Editor.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Complete.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Details.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Files.ascx
# OurUmbraco.Site/usercontrols/Deli/Package/Steps/Screenshots.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx
# OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx
# OurUmbraco/Our/MigrationsHandler.cs
# OurUmbraco/OurUmbraco.csproj
# build/BuildClientFiles.bat
|
2016-11-07 08:45:46 +01:00 |
|