-
Grigory Fedorov authored
Conflicts: app/src/main/res/xml/preference_editor.xml
cac564df
| Name |
Last commit
|
Last update |
|---|---|---|
| app | ||
| gradle/wrapper | ||
| scripts | ||
| .gitignore | ||
| .gitmodules | ||
| LICENSE | ||
| README.rst | ||
| build.gradle | ||
| gradlew | ||
| gradlew.bat | ||
| settings.gradle |
Conflicts: app/src/main/res/xml/preference_editor.xml
| Name |
Last commit
|
Last update |
|---|---|---|
| app | ||
| gradle/wrapper | ||
| scripts | ||
| .gitignore | ||
| .gitmodules | ||
| LICENSE | ||
| README.rst | ||
| build.gradle | ||
| gradlew | ||
| gradlew.bat | ||
| settings.gradle |