{"shas":[["e42c091037e15339a8a6ce840e33ad5ae5bd6777","a4105719978d73d6a3b9863f3649fb89f3d41efa@googlemail.com","Merge branch 'master' of github.com:larsrottmann/inovex-app-client\n\nConflicts:\n\tInovex App/res/values-de/strings.xml\n\tInovex App/res/values/strings.xml\n\tInovex App/src/de/inovex/app/activities/MainMenuActivity.java\n\tInovex App/src/de/inovex/app/provider/InovexContentProvider.java","Renard Wellnitz"],["30c8be87a309c204c242f586cd0975cc2aae5ce9","a4105719978d73d6a3b9863f3649fb89f3d41efa@googlemail.com","Merge branch 'master' of github.com:larsrottmann/inovex-app-client\n\nConflicts:\n\tInovex App/src/de/inovex/app/activities/NewJourneyActivity.java\n\tInovex App/src/de/inovex/app/activities/NewTimeActivity.java\n\tInovex App/src/de/inovex/app/provider/InovexContentProvider.java","Renard Wellnitz"]],"ref":"refs/heads/master","size":2,"head":"30c8be87a309c204c242f586cd0975cc2aae5ce9","push_id":42030656}