Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into data-model-feature

This commit is contained in:
Claudio Maggioni (maggicl) 2020-02-22 20:57:15 +01:00
commit 87c17434ac
9 changed files with 14 additions and 2 deletions

14
.gitignore vendored
View file

@ -118,3 +118,17 @@ fabric.properties
# Android studio 3.1+ serialized cache file # Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser .idea/caches/build_file_checksums.ser
.gradle
/build/
# Ignore Gradle GUI config
gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Cache of project
.gradletasknamecache
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

View file

@ -1,2 +0,0 @@
#Thu Feb 20 16:16:13 CET 2020
gradle.version=6.2