 Sebastiaan Janssen
|
e8565650e4
|
Merge branch 'master' into move-masterpages-to-views
# Conflicts:
# .gitignore
# OurUmbraco.Site/OurUmbraco.Site.csproj
# OurUmbraco.Site/Views/MacroPartials/Members/ForgotPassword.cshtml
# OurUmbraco.Site/Views/Partials/Members/ForgotPassword.cshtml
# OurUmbraco.Site/Views/Partials/Members/Login.cshtml
# OurUmbraco.Site/Views/Search/Search.aspx.cs
# OurUmbraco.Site/Views/Web.config
# OurUmbraco.Site/config/ClientDependency.config
# OurUmbraco.Site/config/Dashboard.config
# OurUmbraco.Site/config/imageprocessor/cache.config
# OurUmbraco.Site/masterpages/Community.master
# OurUmbraco.Site/masterpages/ReleaseProgress.master
# OurUmbraco.Site/masterpages/Repository/Projects.master
# OurUmbraco.Site/masterpages/popular.master
# OurUmbraco.Site/packages.config
# OurUmbraco/Our/Controllers/LoginController.cs
# OurUmbraco/Our/MigrationsHandler.cs
# OurUmbraco/OurUmbraco.csproj
# OurUmbraco/packages.config
|
2017-01-21 18:47:09 +01:00 |
|