Merge

12 years ago · dfc12d728c
parent a8ccac4d18 d35ebf14f6
commit dfc12d728c
1 changed files with 2 additions and 1 deletions
--- a/.hgignore
+++ b/.hgignore
@ -38,3 +38,4 @@ _ReSharper*/
 # ncrunch files
 *.ncrunchsolution
 *.ncrunchproject
 MediaBrowser.Common/Kernel/BaseKernel.cs.orig