GitHub PushEvent at 2014-11-17 12:41:39
Repository: Catan
Actor: sexysoushi
Payload: {"shas":[["4dd7584d15ec0179989bc06bb84851123dcb2b9a","efe448230144ea2fc34b73574f072f4bc2eb6b58@hotmail.com","creation branch2","sexysoushi",false],["adeefe1a1e79027e4a5e5f9f0b6a8649eaf42be3","efe448230144ea2fc34b73574f072f4bc2eb6b58@hotmail.com","commit","sexysoushi",false],["8be1cfcf338510d4b0b3339a6ead9ad9f51c768e","bee45d22025de3339b6f1d49ba0380cf046e136f@gmail.com","Merge branch master\nImplémente les changements de la branche master ignorés lors de la création de la branche branch2.","Scentle5S",false],["4366f2c854048c75cf99ddc53d8fba2f1e7fef4c","bee45d22025de3339b6f1d49ba0380cf046e136f@gmail.com","Utilise le GridBagLayout pour placer les composants.\nPlacement simplifié et plus propre.","Scentle5S",false],["71b98818bc35595f5fcc863358b03072953c876a","efe448230144ea2fc34b73574f072f4bc2eb6b58@hotmail.com","Merge branch 'branch2' of https://github.com/Scentle5S/Catan\n\nConflicts:\n\tsrc/Main.java\n\tsrc/view/MainFrame.java","sexysoushi",true]],"size":5,"ref":"refs/heads/master","head":"71b98818bc35595f5fcc863358b03072953c876a"}