Aran Zaiger
2ff762fced
# Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java # app/src/main/res/layout/fragment_personal.xml |
||
---|---|---|
.. | ||
copyright | ||
inspectionProfiles | ||
libraries | ||
.name | ||
compiler.xml | ||
encodings.xml | ||
gradle.xml | ||
misc.xml | ||
modules.xml | ||
runConfigurations.xml | ||
vcs.xml |