mirror of
https://github.com/mediathekview/zapp.git
synced 2024-09-20 12:22:15 +02:00
d9ea5b8b1e
# Conflicts: # app/src/main/res/raw/changelog.md |
||
---|---|---|
.. | ||
codeStyles | ||
inspectionProfiles | ||
assetWizardSettings.xml | ||
compiler.xml | ||
encodings.xml | ||
gradle.xml | ||
misc.xml | ||
modules.xml | ||
vcs.xml |