GitHub PushEvent at 2014-04-16 10:29:55
Repository: SDP-Calendar
Actor: lottle
Payload: {"shas":[["bf68a12e3332391504461246e3aaff6c0d6c3607","bb804e88bf2acc917d8b9fe7f85dbbd69057779c@outlook.com","Added facebook login. Needs to fix the connection to facebook app_id,\nmost likely to do with the hashkey. If it doesnt run on your laptop, you\nmay need to install the facebook SDK from:\nhttps://developers.facebook.com/docs/android/getting-started/","lottle",true],["fab2589488f3159d9c2ac863fdc73d4380c31355","bb804e88bf2acc917d8b9fe7f85dbbd69057779c@outlook.com","Merge branch 'Farah' of https://github.com/evolutionise/SDP-Calendar.git into Farah","lottle",true],["f34856a1c77dfb33cc6142890596499560e23beb","bb804e88bf2acc917d8b9fe7f85dbbd69057779c@outlook.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tCalendar/AndroidManifest.xml\n\tCalendar/bin/AndroidManifest.xml\n\tCalendar/bin/Calendar.apk\n\tCalendar/bin/classes.dex\n\tCalendar/bin/resources.ap_\n\tCalendar/project.properties\n\tCalendar/src/com/example/calendar/Calendar.java","lottle",true],["2a60145ab7b65c23d2a78a15fc384f6a8c415bf0","bb804e88bf2acc917d8b9fe7f85dbbd69057779c@outlook.com","Merge branch 'master' of\nhttps://github.com/evolutionise/SDP-Calendar.git\n\nConflicts:\n\tCalendar/bin/Calendar.apk\n\tCalendar/bin/classes.dex\n\tCalendar/bin/dexedLibs/android-support-v4-ff8b04f2b9cda92c7debcd280f4851b7.jar\n\tCalendar/bin/resources.ap_","lottle",true]],"size":4,"ref":"refs/heads/master","head":"2a60145ab7b65c23d2a78a15fc384f6a8c415bf0"}