jellyfin/MediaBrowser.Dlna/Didl
Luke Pulverenti c48458f215 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	SharedVersion.cs
2014-12-01 13:42:07 -05:00
..
DidlBuilder.cs Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-12-01 13:42:07 -05:00
Filter.cs update translations 2014-06-29 15:59:52 -04:00