Luke
							
						 | 
						
							
							
								c15acd0ebc
							
							Merge pull request #2355 from MediaBrowser/dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								2345d02b41
							
							add error handling
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								b66d076def
							
							Merge pull request #2353 from MediaBrowser/dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								e78bbbd6f1
							
							Merge pull request #2352 from MediaBrowser/master
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								de06847f41
							
							Merge pull request #2351 from MediaBrowser/master
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								d7ad1331f1
							
							fix merge conflict
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								e7cebb91a7
							
							Merge pull request #2350 from MediaBrowser/beta
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								025905a3e4
							
							fix merge conflict
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								54d5b71577
							
							restore version
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								4853e795d7
							
							fix merge conflict
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								bc58e2862c
							
							fix merge conflicts
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								e7e0a1ecfc
							
							fix merge conflict
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								ae1110219d
							
							fix merge conflicts
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								aaa027f322
							
							Merge pull request #2349 from MediaBrowser/dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								38b26acd87
							
							Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								fb8e3f0843
							
							speed up timer query by id
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								d63e4f5573
							
							update mac project
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								f4b3ad24e0
							
							3.1.259
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								0a7b5861b6
							
							Merge pull request #2348 from MediaBrowser/dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								bc6d28222a
							
							Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								2d09c187cc
							
							redesign series timer edit screen
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								a25fb37c80
							
							update mac project
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								3c586ac7e0
							
							3.1.258
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								03acdc7cc9
							
							Merge pull request #2347 from MediaBrowser/dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								c99fa9a651
							
							update timer images
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								2481c5d9f8
							
							fix boxset socket events
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								5666049e57
							
							3.1.257
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								799fbd6f32
							
							Merge pull request #2346 from MediaBrowser/dev
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke Pulverenti
							
						 | 
						
							
							
								cc73830cd6
							
							fix music album image inheritance
						 | 
						9 years ago | 
					
				
					
						
							
								   Luke
							
						 | 
						
							
							
								12f46d961b
							
							Merge pull request #2345 from MediaBrowser/dev
						 | 
						9 years ago |