{"shas":[["58206a5a46fa60b2cff41e9753f6109981f29f96","4d6126898673d15d7cd00119f2be740619622ad1@hsr.ch","AthleteDataTableModel / SquadSelecetionFrame / CompetitionPanel /\nDBController Refactor","Marco Pfiffner"],["325e3f93bf850ab06176de79e5edad9deb277a61","4d6126898673d15d7cd00119f2be740619622ad1@hsr.ch","Merge branch 'master' of git@github.com:ggrassi/Gymtastic.git\n\nConflicts:\n\tGymtasticApp/src/ch/hsr/gymtastic/server/application/controller/DBController.java\n\tGymtasticApp/src/ch/hsr/gymtastic/server/presentation/frames/panels/CompetitionPanel.java","Marco Pfiffner"]],"repo":"ggrassi/Gymtastic","actor":"Sambuca","ref":"refs/heads/master","size":2,"head":"325e3f93bf850ab06176de79e5edad9deb277a61","actor_gravatar":"ea5e113065f6bd99a28aaf50f45d5196","push_id":32017384}