diff options
| author | Thomas <tschneider.ac@gmail.com> | 2020-05-17 18:33:37 +0200 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2020-05-17 18:33:37 +0200 |
| commit | d6e73438115923699127ab8abb840728259e56b7 (patch) | |
| tree | 9258d70188b6e93eb1546b9473170e3331ccd0c8 | |
| parent | 4647167d27267caf097e89bbcb06577ff1d8a548 (diff) | |
| parent | ea824daa6d81e412851544867327ac0c05c1177e (diff) | |
Merge branch 'develop'2.35.4
# Conflicts:
# app/build.gradle