Merge pull request #5 from szakitom/development
merge of labor4
Showing
- .idea/caches/build_file_checksums.ser 0 additions, 0 deletions.idea/caches/build_file_checksums.ser
- .idea/codeStyles/Project.xml 29 additions, 0 deletions.idea/codeStyles/Project.xml
- .travis.yml 5 additions, 3 deletions.travis.yml
- app/build.gradle 1 addition, 1 deletionapp/build.gradle
- app/src/main/AndroidManifest.xml 1 addition, 0 deletionsapp/src/main/AndroidManifest.xml
- build.gradle 1 addition, 1 deletionbuild.gradle
- gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletionsgradle/wrapper/gradle-wrapper.properties
Loading
Please register or sign in to comment