summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/App.java
diff options
context:
space:
mode:
authorSimon Rettberg2014-10-02 18:50:15 +0200
committerSimon Rettberg2014-10-02 18:50:15 +0200
commit397af7dbf782e39809b78074699c3a125412e62f (patch)
tree8276806175cb73a476436fe1228cae080bac95c4 /src/main/java/org/openslx/imagemaster/App.java
parentMerge branch 'master' of dnbd3:bwlp/masterserver (diff)
downloadmasterserver-397af7dbf782e39809b78074699c3a125412e62f.tar.gz
masterserver-397af7dbf782e39809b78074699c3a125412e62f.tar.xz
masterserver-397af7dbf782e39809b78074699c3a125412e62f.zip
Implement API methods getPublicImages, getOrganizations
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/App.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/App.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 5a325ba..7a6a1ad 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -29,9 +29,6 @@ public class App
// Init logging
log.info( "Starting Application" );
- // Init the properties and load uploading images from database
- Globals.init();
-
// Create binary listener
Thread t;
t = new Thread( new BinaryListener(), "BinaryListener" );