145fc0d76f
# Conflicts: # app/src/main/AndroidManifest.xml - splash JPG added |
||
---|---|---|
.. | ||
androidTest/java/com/android_app/matan/ara/sagi/thesocialnotework | ||
main | ||
test/java/com/android_app/matan/ara/sagi/thesocialnotework |
145fc0d76f
# Conflicts: # app/src/main/AndroidManifest.xml - splash JPG added |
||
---|---|---|
.. | ||
androidTest/java/com/android_app/matan/ara/sagi/thesocialnotework | ||
main | ||
test/java/com/android_app/matan/ara/sagi/thesocialnotework |