Merge branch 'master' into master

jpush · May 20, 2020 · 592bf0d · 592bf0d
2 parents 45321c8 + a9a7a3d
commit 592bf0d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ target/
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /target/
+pom.xml.releaseBackup
+release.properties