Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll

1 files changed, 12 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Resolvers/IResolutionIgnoreRule.cs b/MediaBrowser.Controller/Resolvers/IResolutionIgnoreRule.cs
new file mode 100644
index 000000000..661688f3c
--- /dev/null
+++ b/MediaBrowser.Controller/Resolvers/IResolutionIgnoreRule.cs
@@ -0,0 +1,12 @@
+using MediaBrowser.Controller.Library;
+
+namespace MediaBrowser.Controller.Resolvers
+{
+    /// <summary>
+    /// Provides a base "rule" that anyone can use to have paths ignored by the resolver
+    /// </summary>
+    public interface IResolutionIgnoreRule
+    {
+        bool ShouldIgnore(ItemResolveArgs args);
+    }
+}