Merge remote-tracking branch 'origin/master'

lazarenkod · lazarenkod · commit 8c658c3c83a7 · 2017-03-17T16:15:07.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+# spring-boot-sample-jelastic
+Spring Boot Web UI Sample for Jelastic Cloud

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# spring-boot-sample-jelastic`
	`2`	`+Spring Boot Web UI Sample for Jelastic Cloud`