update merge · f40a5f2e0d - jellyfin-web - Jones Residence

wjones/jellyfin-web

update merge

This commit is contained in:

Luke Pulverenti

2015-09-20 13:36:09 -04:00

parent e4bd2fbead

commit f40a5f2e0d

4 changed files with 4 additions and 3 deletions

									
										dashboard-ui/forgotpassword.html
									
		+1
		-1
	
												View File
												
				@@ -33,4 +33,4 @@

				        </div>

				    </div>

				</body>

				</html>

				</html>

									
										dashboard-ui/forgotpasswordpin.html
									
		+1
		-1
	
												View File
												
				@@ -32,4 +32,4 @@

				        </div>

				    </div>

				</body>

				</html>

				</html>

									
										dashboard-ui/metadataadvanced.html
									
		+1
		-1
	
												View File
												
				@@ -196,4 +196,4 @@

				        </div>

				    </div>

				</body>

				</html>

				</html>

									
										dashboard-ui/scripts/metadataadvanced.js
									
		+1
		
												View File
												
				@@ -330,3 +330,4 @@

				    }

				})(window, jQuery);