Merge branch 'main' into add-vedha-to-about

pennlabs · Sep 29, 2023 · 10d0785 · 10d0785
2 parents 22b3713 + a4f9ffb
commit 10d0785
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ out/
 .gradle/
 build/
 .idea/
+gradle/wrapper/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -71,4 +72,4 @@ fastlane/readme.md
 # Crashlytics and API keys
 src/main/assets/crashlytics-build.properties
 src/main/res/values/com_crashlytics_export_strings.xml
-crashlytics.properties
+crashlytics.properties
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
@@ -62,6 +62,7 @@ class AboutFragment : Fragment() {
         val members = arrayListOf("Rohan Chhaya", "Anna Jiang", "Julius Snipes", "Zhiyan Lu",
             "Belinda Xi", "Vishesh Patel", "Ali Krema", "Jenny Li", "Sruthi Kurada", "Charis Gao",
             "Trini Feng", "Vedha Avali")
+
         val alumni = arrayListOf("Marta García Ferreiro", "Varun Ramakrishnan", "Sahit Penmatcha",
             "Anna Wang", "Sophia Ye", "Awad Irfan", "Liz Powell", "Davies Lumumba")
         view.our_team_rv?.adapter = AboutAdapter(members)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 11 21:11:21 PDT 2021
+#Sun Sep 24 13:00:24 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip