Commit Graph

2 Commits

Author SHA1 Message Date
Shannon
64b247157c Merge commit '0f25029ff6531095782a567bf054d6bc209e2a56' into 7.0.2
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
2013-12-16 16:21:38 +11:00
Shannon
0f25029ff6 Fixed typo 2013-12-16 16:02:34 +11:00