Merge remote-tracking branch 'origin/netcore/feature/ab5820-webprofiler-aspnetcore' into netcore/feature/ab5820-webprofiler-aspnetcore

Browse Source

# Conflicts:
#	src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
#	src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs

...

This commit is contained in:

Bjarke Berg

2020-03-24 18:57:29 +01:00

parent 9339e1d999 d577452aff

commit e8095b1a36

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available