Matthieu d49e0f58ff Merge branch 'master' into 'profile_perf_fix' ...

# Conflicts:
#   app/build.gradle
#   app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
#   build.gradle

2022-03-17 22:11:15 +00:00

..

src

Merge branch 'master' into 'profile_perf_fix'

2022-03-17 22:11:15 +00:00

.gitignore

init project files

2020-02-28 00:36:26 +01:00

build.gradle

Merge branch 'master' into 'profile_perf_fix'

2022-03-17 22:11:15 +00:00

licenses.yml

Update dependencies

2022-02-17 12:22:16 +01:00

proguard-rules.pro

Fix license crash by adding proguard rules

2022-02-28 11:42:04 +01:00