{"push_id":920863317,"size":4,"distinct_size":4,"ref":"refs/heads/master","head":"e7b5190eee1307ed10c627d16063f3e64efb7b82","before":"14913dd8a3bf1f2428e4159fc55b9144fccfe9cd","commits":[{"sha":"02709214d2128a9bf2249f26ac0f33d8c8c01b77","author":{"email":"9f25008859d71cf91da7bf1cfd9bb8bf6a3f63cb@gmail.com","name":"Roi"},"message":"Login en proceso. Contiene errores","distinct":true,"url":"https://api.github.com/repos/serralba/EHU-Ukelele/commits/02709214d2128a9bf2249f26ac0f33d8c8c01b77"},{"sha":"e35ace1ddf9d27623132c0e9dea4d399ba3e9fdb","author":{"email":"9f25008859d71cf91da7bf1cfd9bb8bf6a3f63cb@gmail.com","name":"Roi"},"message":"Login terminado, base de datos preparada.","distinct":true,"url":"https://api.github.com/repos/serralba/EHU-Ukelele/commits/e35ace1ddf9d27623132c0e9dea4d399ba3e9fdb"},{"sha":"a4bbaeb7d5e2925226c22d34f8dfe8312c4f1885","author":{"email":"9f25008859d71cf91da7bf1cfd9bb8bf6a3f63cb@gmail.com","name":"Roi"},"message":"Pantalla de acordes en proceso","distinct":true,"url":"https://api.github.com/repos/serralba/EHU-Ukelele/commits/a4bbaeb7d5e2925226c22d34f8dfe8312c4f1885"},{"sha":"e7b5190eee1307ed10c627d16063f3e64efb7b82","author":{"email":"9f25008859d71cf91da7bf1cfd9bb8bf6a3f63cb@gmail.com","name":"Roi"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\t.gradle/2.8/taskArtifacts/cache.properties.lock\n#\t.gradle/2.8/taskArtifacts/fileHashes.bin\n#\t.gradle/2.8/taskArtifacts/fileSnapshots.bin\n#\t.gradle/2.8/taskArtifacts/taskArtifacts.bin\n#\tapp/build/generated/source/r/debug/assig/app2/learnukulele/R.java\n#\tapp/build/intermediates/classes/debug/assig/app2/learnukulele/R$id.class\n#\tapp/build/intermediates/classes/debug/assig/app2/learnukulele/R$string.class\n#\tapp/build/intermediates/classes/debug/assig/app2/learnukulele/R$style.class\n#\tapp/build/intermediates/classes/debug/assig/app2/learnukulele/R.class\n#\tapp/build/intermediates/classes/debug/assig/app2/learnukulele/WikiActivity.class\n#\tapp/build/intermediates/incremental/mergeDebugResources/merger.xml\n#\tapp/build/intermediates/pre-dexed/debug/debug_0e83b2c5296ec7545dcfefc51698fc1d9b29b0cd.jar\n#\tapp/build/intermediates/res/merged/debug/layout/activity_wiki.xml\n#\tapp/build/intermediates/res/resources-debug.ap_\n#\tapp/build/intermediates/transforms/dex/debug/folders/1000/1f/main/classes.dex\n#\tapp/build/outputs/apk/app-debug-unaligned.apk\n#\tapp/build/outputs/apk/app-debug.apk\n#\tapp/src/main/res/values/strings.xml","distinct":true,"url":"https://api.github.com/repos/serralba/EHU-Ukelele/commits/e7b5190eee1307ed10c627d16063f3e64efb7b82"}]}