Merge branch 'master' into 'Disapp_pt'
# Conflicts: # app/src/main/res/values-pt/strings.xml
Branches
Tags
Showing
- .idea/assetWizardSettings.xml 0 additions, 32 deletions.idea/assetWizardSettings.xml
- .idea/caches/build_file_checksums.ser 0 additions, 0 deletions.idea/caches/build_file_checksums.ser
- README.md 51 additions, 10 deletionsREADME.md
- app/build.gradle 8 additions, 8 deletionsapp/build.gradle
- app/release/output.json 1 addition, 0 deletionsapp/release/output.json
- app/src/main/assets/screen1.png 0 additions, 0 deletionsapp/src/main/assets/screen1.png
- app/src/main/assets/screen2.png 0 additions, 0 deletionsapp/src/main/assets/screen2.png
- app/src/main/assets/screen3.png 0 additions, 0 deletionsapp/src/main/assets/screen3.png
- app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java 2 additions, 2 deletions...rc/main/java/org/disroot/disrootapp/ui/AboutActivity.java
- app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java 32 additions, 46 deletions...src/main/java/org/disroot/disrootapp/ui/MainActivity.java
- app/src/main/res/layout/activity_main.xml 4 additions, 0 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/values-es/strings.xml 21 additions, 8 deletionsapp/src/main/res/values-es/strings.xml
- app/src/main/res/values-fr/strings.xml 100 additions, 101 deletionsapp/src/main/res/values-fr/strings.xml
- app/src/main/res/values-it/strings.xml 130 additions, 0 deletionsapp/src/main/res/values-it/strings.xml
- app/src/main/res/values-nl/strings.xml 131 additions, 0 deletionsapp/src/main/res/values-nl/strings.xml
- app/src/main/res/values-pt/strings.xml 22 additions, 22 deletionsapp/src/main/res/values-pt/strings.xml
- app/src/main/res/values/strings.xml 9 additions, 10 deletionsapp/src/main/res/values/strings.xml
- app/src/main/res/xml/changelog_master.xml 17 additions, 0 deletionsapp/src/main/res/xml/changelog_master.xml
- build.gradle 2 additions, 6 deletionsbuild.gradle
- gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletionsgradle/wrapper/gradle-wrapper.properties
Please register or sign in to comment