Commit History

Author SHA1 Message Date
  Luke Pulverenti b42317c0c4 fix merge conflict 9 years ago
  Luke Pulverenti b9ce0a3223 3.0.5871 9 years ago
  Luke Pulverenti 8a43554c59 Merge branch 'master' of https://github.com/MediaBrowser/Emby 9 years ago
  Luke 2c6064cb65 Merge pull request #1469 from MediaBrowser/beta 9 years ago
  Luke Pulverenti e37bf6b986 restore changes 9 years ago
  Luke Pulverenti 78484a2813 Merge branch 'master' of https://github.com/MediaBrowser/Emby 9 years ago
  Luke 25a3207543 Merge pull request #1468 from MediaBrowser/dev 9 years ago
  Luke Pulverenti 1285512160 fix merge conflict 9 years ago
  Luke Pulverenti cc98b04c5d fix xbox one, ps4 not seeing dlna server 9 years ago
  Luke Pulverenti 5bf7e6d80c update libs 9 years ago
  Luke Pulverenti f7d046d00e enable shared components 9 years ago
  Luke Pulverenti 600aa76865 update recordings 9 years ago
  Luke Pulverenti 41bf9e26f4 3.0.5879 9 years ago
  Luke 8a2eeba914 Merge pull request #1467 from MediaBrowser/dev 9 years ago
  Luke Pulverenti f95e780a4d update linux ffmpeg 9 years ago
  Luke Pulverenti 0069da65b9 update music filters 9 years ago
  Luke Pulverenti 1dcdabe5e5 update episode filters 9 years ago
  Luke Pulverenti dc36859ae9 update game filters 9 years ago
  Luke Pulverenti 947d895fe8 stub out sat/ip discovery 9 years ago
  Luke Pulverenti ea83790305 3.0.5870 9 years ago
  Luke dd9f5270ea Merge pull request #1465 from MediaBrowser/beta 9 years ago
  Luke bfd53d0c43 Merge pull request #1464 from MediaBrowser/dev 9 years ago
  Luke Pulverenti 4700546875 update migration process 9 years ago
  Luke Pulverenti 681ffa96b3 3.0.5868 9 years ago
  Luke 5bee5acd27 Merge pull request #1463 from MediaBrowser/beta 9 years ago
  Luke Pulverenti 65e0cd7740 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 9 years ago
  Luke 95347ba7b3 Merge pull request #1462 from MediaBrowser/dev 9 years ago
  Luke Pulverenti 77d7d562bd 3.0.5878 9 years ago
  Luke Pulverenti 622b0558d4 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 9 years ago
  Luke Pulverenti 82f4518c55 fix merge conflict 9 years ago