Merge remote-tracking branch 'origin/dev' into dev

6 years ago · b15534d558
parent a2fe1a80f9 540884404f
commit b15534d558
1 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,4 +12,4 @@ target
 *.class
 .md
 *.log
-#*.properties
+*.properties