Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d8292155ae
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user