summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorNils Schwabe2014-07-04 11:01:15 +0200
committerNils Schwabe2014-07-04 11:01:15 +0200
commit4414f9a65b1b41088fa360ac51df53d79930e20a (patch)
tree99095acd9d15dacb8cf7f24f60ddc4e235813063 /.gitignore
parentChange loading and checking of properties (diff)
downloadmasterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.tar.gz
masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.tar.xz
masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.zip
Fix that Globals are initialized before servers are starting up
Add serversocket.jks to .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index cf08934..1b75bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
/src/main/java/org/openslx/imagemaster/thrift/iface
/gen-java
/src/main/properties/ftp.properties
-/config/ftp.jks
+/config/sslsocket.jks
/config/ldap.jks
/config/servers.jks
/management-interface/tmp