Merge branch 'master' of ssh://gitlab.ce.jku.at:10022/k11771360/tomcat-minirest

.gitignore

+# Making git ignore the following files and paths:
+
+# target directory for compiled classes
 /target/
+
+# IntelliJ IDEA / other JetBrains application specific project files
+*.idea/
+*.eml
+
+# Eclipse specific project files
+*.settings/
+*.project
+*.classpath
+
+# General files
+.doc*
+.vsd*
+.vsd*
+.xls*
\ No newline at end of file

.gitmodules

 [submodule "src/main/webapp/html-minirest"]
 	path = src/main/webapp/html-minirest
-	url = ssh://git@gitlab.ce.jku.at:10022/k11771360/html-minirest.git
+	url = https://gitlab.ce.jku.at/k11771360/html-minirest.git

pom.xml

@@ -6,7 +6,7 @@
     <groupId>university</groupId>
     <artifactId>at.jku.ce</artifactId>
     <packaging>war</packaging>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.1a</version>
     <name>at.jku.ce</name>
 
     <build>

html-minirest @ 22841e6e

-Subproject commit 3aa4125b377b8de8a9330f8139ded46155e234c5
+Subproject commit 22841e6e34e08042ae87f8ee03ffb21bcd874296