Merge branch 'master' into 'disapp-sr'
# Conflicts: # app/src/main/res/values-sr/strings.xml
Showing
- .idea/assetWizardSettings.xml 2 additions, 2 deletions.idea/assetWizardSettings.xml
- .idea/caches/build_file_checksums.ser 0 additions, 0 deletions.idea/caches/build_file_checksums.ser
- .idea/caches/gradle_models.ser 0 additions, 0 deletions.idea/caches/gradle_models.ser
- .idea/codeStyles/Project.xml 0 additions, 29 deletions.idea/codeStyles/Project.xml
- app/build.gradle 2 additions, 2 deletionsapp/build.gradle
- app/src/main/AndroidManifest.xml 18 additions, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/org/disroot/disrootapp/StatusBroadcastReceiver.java 16 additions, 0 deletions.../java/org/disroot/disrootapp/StatusBroadcastReceiver.java
- app/src/main/java/org/disroot/disrootapp/StatusService.java 187 additions, 0 deletionsapp/src/main/java/org/disroot/disrootapp/StatusService.java
- app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java 61 additions, 149 deletions...src/main/java/org/disroot/disrootapp/ui/MainActivity.java
- app/src/main/res/drawable/ic_battery.xml 6 additions, 0 deletionsapp/src/main/res/drawable/ic_battery.xml
- app/src/main/res/menu/menu_main.xml 4 additions, 0 deletionsapp/src/main/res/menu/menu_main.xml
- app/src/main/res/values-de/strings.xml 164 additions, 0 deletionsapp/src/main/res/values-de/strings.xml
- app/src/main/res/values-es/strings.xml 7 additions, 4 deletionsapp/src/main/res/values-es/strings.xml
- app/src/main/res/values-fr/strings.xml 6 additions, 3 deletionsapp/src/main/res/values-fr/strings.xml
- app/src/main/res/values-it/strings.xml 5 additions, 2 deletionsapp/src/main/res/values-it/strings.xml
- app/src/main/res/values-nl/strings.xml 5 additions, 2 deletionsapp/src/main/res/values-nl/strings.xml
- app/src/main/res/values-pt/strings.xml 7 additions, 4 deletionsapp/src/main/res/values-pt/strings.xml
- app/src/main/res/values/strings.xml 6 additions, 3 deletionsapp/src/main/res/values/strings.xml
- app/src/main/res/xml/changelog_master.xml 11 additions, 0 deletionsapp/src/main/res/xml/changelog_master.xml
Please register or sign in to comment