{"push_id":820248389,"size":4,"distinct_size":4,"ref":"refs/heads/master","head":"d92cccb3737a6c2fe3471877a56d4a5304e52709","before":"b036448c73c9d7b95226349ec15999a0696cf445","commits":[{"sha":"f932febdac0d66781338e5cc2a4da958d8e27156","author":{"email":"3fa29a9830a978ed13759699b9c8a513cec3176f@gmail.com","name":"Juma94"},"message":"Ajout splashscreen","distinct":true,"url":"https://api.github.com/repos/Juma94/BattleTap/commits/f932febdac0d66781338e5cc2a4da958d8e27156"},{"sha":"98bf20c4f8971ca519274b99809a1f0f85623318","author":{"email":"3fa29a9830a978ed13759699b9c8a513cec3176f@gmail.com","name":"Juma94"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\t.gradle/2.4/taskArtifacts/cache.properties.lock\n#\t.gradle/2.4/taskArtifacts/fileHashes.bin\n#\t.gradle/2.4/taskArtifacts/fileSnapshots.bin\n#\t.gradle/2.4/taskArtifacts/taskArtifacts.bin\n#\tapp/build/intermediates/classes/debug/android/support/design/R$drawable.class\n#\tapp/build/intermediates/classes/debug/android/support/v7/appcompat/R$drawable.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/BluetoothBattle.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/DeviceListActivity.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/ExpandListAdapter.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$drawable.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$id.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$layout.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$menu.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$mipmap.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$string.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$style.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R$styleable.class\n#\tapp/build/intermediates/classes/debug/com/julab/battletap/R.class\n#\tapp/build/intermediates/dex/debug/classes.dex\n#\tapp/build/intermediates/incremental/mergeResourcesdebug/merger.xml\n#\tapp/build/intermediates/manifests/full/debug/AndroidManifest.xml\n#\tapp/build/intermediates/res/resources-debug.ap_\n#\tapp/build/intermediates/symbols/debug/R.txt\n#\tapp/build/outputs/apk/app-debug-unaligned.apk\n#\tapp/build/outputs/apk/app-debug.apk\n#\tapp/build/outputs/logs/manifest-merger-debug-report.txt\n#\tapp/src/main/AndroidManifest.xml","distinct":true,"url":"https://api.github.com/repos/Juma94/BattleTap/commits/98bf20c4f8971ca519274b99809a1f0f85623318"},{"sha":"1c3dfb606e72734943a76de9fcc1a9a659f52571","author":{"email":"3fa29a9830a978ed13759699b9c8a513cec3176f@gmail.com","name":"Juma94"},"message":"Ajout splashscreen","distinct":true,"url":"https://api.github.com/repos/Juma94/BattleTap/commits/1c3dfb606e72734943a76de9fcc1a9a659f52571"},{"sha":"d92cccb3737a6c2fe3471877a56d4a5304e52709","author":{"email":"3fa29a9830a978ed13759699b9c8a513cec3176f@gmail.com","name":"Juma94"},"message":"Ajout splashscreen","distinct":true,"url":"https://api.github.com/repos/Juma94/BattleTap/commits/d92cccb3737a6c2fe3471877a56d4a5304e52709"}]}