Merge pull request #277 from mrjoel/mrjoel-serverNPEfix

James Moger

2015-06-30 b5c7332f5976cc19ab681ed4b82501a62c6a2f61

 src/main/java/com/gitblit/servlet/LogoServlet.java

@@ -21,8 +21,8 @@
import java.io.InputStream;

import java.io.OutputStream;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletContext;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;