{"head":"292c33c10151f5bb2fe308eea09622dc08ec3165","size":3,"push_id":45095362,"shas":[["04cf1f17353fb21b06edc874ca5ee90a7582a852","8af83cd74418e6d82cbb48d7e56838f8bf7cf1a0@usrbin.de","Merge branch 'master' of https://github.com/thyseus/gii-template-collection into merge-with-thyseus\napplied hotfixes\nadded fallback for identification column\nConflicts:\n\tfullCrud/FullCrudCode.php\n\tfullCrud/templates/default/controller.php\n\tfullCrud/templates/default/view.php","Tobias Munk"],["fe3fb3592207695a73bdd4fc7f43487fb0182c94","8af83cd74418e6d82cbb48d7e56838f8bf7cf1a0@usrbin.de","Merge branch 'master' of github.com:schmunk42/gii-template-collection into merge-with-thyseus","Tobias Munk"],["292c33c10151f5bb2fe308eea09622dc08ec3165","8af83cd74418e6d82cbb48d7e56838f8bf7cf1a0@usrbin.de","Merge pull request #2 from schmunk42/merge-with-thyseus\n\nAll changes back to master","Tobias Munk"]],"ref":"refs/heads/master"}