07ccc2696b
# Conflicts: # app/build.gradle |
||
---|---|---|
.. | ||
androidTest | ||
main | ||
sharedTest/java/org/thoughtcrime/securesms | ||
test |
07ccc2696b
# Conflicts: # app/build.gradle |
||
---|---|---|
.. | ||
androidTest | ||
main | ||
sharedTest/java/org/thoughtcrime/securesms | ||
test |