Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2017-06-22 17:57:02 +09:00
commit d8292155ae

4
.gitignore vendored
View File

@ -44,7 +44,7 @@ crashlytics.properties
crashlytics-build.properties crashlytics-build.properties
fabric.properties fabric.properties
### Maven template ### Maven template
target/
pom.xml.tag pom.xml.tag
pom.xml.releaseBackup pom.xml.releaseBackup
pom.xml.versionsBackup pom.xml.versionsBackup
@ -82,7 +82,7 @@ hs_err_pid*
.idea/ .idea/
*.iml *.iml
target/ /target/
.settings/ .settings/
.classpath .classpath
.project .project