Merge remote-tracking branch 'origin/dev' into dev
Showing
- app/src/main/res/drawable/broadcast_btn.png 0 additions, 0 deletionsapp/src/main/res/drawable/broadcast_btn.png
- app/src/main/res/drawable/download_history.png 0 additions, 0 deletionsapp/src/main/res/drawable/download_history.png
- app/src/main/res/drawable/keluar.png 0 additions, 0 deletionsapp/src/main/res/drawable/keluar.png
- app/src/main/res/drawable/upload_history.png 0 additions, 0 deletionsapp/src/main/res/drawable/upload_history.png
- app/src/main/res/layout/fragment_settings.xml 39 additions, 23 deletionsapp/src/main/res/layout/fragment_settings.xml
- app/src/main/res/values/strings.xml 4 additions, 0 deletionsapp/src/main/res/values/strings.xml
Please register or sign in to comment