Commit f71b94c0 authored by Van's avatar Van

Merge remote-tracking branch 'origin/3.0.0-dev' into 3.0.0-dev

parents 59d11630 62c872b2
...@@ -37,7 +37,6 @@ import org.b3log.solo.SoloServletListener; ...@@ -37,7 +37,6 @@ import org.b3log.solo.SoloServletListener;
import org.b3log.solo.model.Common; import org.b3log.solo.model.Common;
import org.b3log.solo.model.Option; import org.b3log.solo.model.Option;
import org.b3log.solo.model.Skin; import org.b3log.solo.model.Skin;
import org.b3log.solo.processor.console.ConsoleRenderer;
import org.b3log.solo.service.DataModelService; import org.b3log.solo.service.DataModelService;
import org.b3log.solo.service.InitService; import org.b3log.solo.service.InitService;
import org.b3log.solo.service.PreferenceQueryService; import org.b3log.solo.service.PreferenceQueryService;
......
...@@ -19,7 +19,6 @@ package org.b3log.solo.processor; ...@@ -19,7 +19,6 @@ package org.b3log.solo.processor;
import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.ioc.Inject; import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
...@@ -37,7 +36,6 @@ import org.b3log.solo.model.UserExt; ...@@ -37,7 +36,6 @@ import org.b3log.solo.model.UserExt;
import org.b3log.solo.service.*; import org.b3log.solo.service.*;
import org.b3log.solo.util.GitHubs; import org.b3log.solo.util.GitHubs;
import org.b3log.solo.util.Solos; import org.b3log.solo.util.Solos;
import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment