Merge branch 'dev-sqlite' into master
# Conflicts: # LaunchServer/LaunchServer.iml |
---|
LaunchServer/LaunchServer.iml |
---|
LaunchServer/source/auth/handler/AuthHandler.java |
---|
LaunchServer/source/auth/handler/SQLiteAuthHandler.java 0 → 100644 |
---|
LaunchServer/source/auth/provider/AuthProvider.java |
---|
LaunchServer/source/auth/provider/SQLiteAuthProvider.java 0 → 100644 |
---|
build/libraries/sqlite.jar 0 → 100644 |
---|
Not supported
|