Commit Graph

4 Commits

Author SHA1 Message Date
Shannon
f7b61d09e2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
2013-12-19 12:53:32 +11:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
mortenbock
c74cdb28d6 Testing the wrapping of view engines 2013-10-03 11:01:37 +02:00
mortenbock
9ec30860b0 Wrap all ViewEngines in a profiler
Wrap all ViewEngines in a custom profiler view engine, using the
ProfilerResolver to track performance
2013-10-02 17:48:44 +02:00