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

2020-02-22 20:57:15 +01:00 · 2020-02-22 20:57:15 +01:00 · 87c17434ac
commit 87c17434ac
parent 1359800845 ad8c408645
9 changed files with 14 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -118,3 +118,17 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .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
--- a/.gradle/6.0.1/executionHistory/executionHistory.bin
+++ b/.gradle/6.0.1/executionHistory/executionHistory.bin
--- a/.gradle/6.0.1/executionHistory/executionHistory.lock
+++ b/.gradle/6.0.1/executionHistory/executionHistory.lock
--- a/.gradle/6.0.1/fileChanges/last-build.bin
+++ b/.gradle/6.0.1/fileChanges/last-build.bin
--- a/.gradle/6.0.1/fileHashes/fileHashes.lock
+++ b/.gradle/6.0.1/fileHashes/fileHashes.lock
--- a/.gradle/6.0.1/gc.properties
+++ b/.gradle/6.0.1/gc.properties
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@ -1,2 +0,0 @@
-#Thu Feb 20 16:16:13 CET 2020
-gradle.version=6.2
--- a/.gradle/vcs-1/gc.properties
+++ b/.gradle/vcs-1/gc.properties