{"push_id":630302705,"size":4,"distinct_size":4,"ref":"refs/heads/joomla3","head":"be273c411bd8689336695dcf948e93191172176e","before":"2c328f7edcffa4c081232bb1ca2d4b7203ccd1bf","commits":[{"sha":"f21f7cde75770dc6661c74beb1013c321ee7ec5e","author":{"email":"1c3558b3b85b0c902d12ed5b6fda362e0935e58c@gmail.com","name":"Hugh Messenger"},"message":"Merging conflict","distinct":true,"url":"https://api.github.com/repos/Fabrik/fabrik/commits/f21f7cde75770dc6661c74beb1013c321ee7ec5e"},{"sha":"05e244c7b26891aef0b2072f4086fe2a6115fff9","author":{"email":"1c3558b3b85b0c902d12ed5b6fda362e0935e58c@gmail.com","name":"Hugh Messenger"},"message":"Merge branch 'joomla3' of ssh://git@github.com/Fabrik/fabrik.git into\njoomla3\n\nConflicts:\n\tplugins/fabrik_element/captcha/layouts/fabrik-element-captcha-nocaptcha.php","distinct":true,"url":"https://api.github.com/repos/Fabrik/fabrik/commits/05e244c7b26891aef0b2072f4086fe2a6115fff9"},{"sha":"20bab1d5a45174eefe1558d1987398533903243e","author":{"email":"1c3558b3b85b0c902d12ed5b6fda362e0935e58c@gmail.com","name":"Hugh Messenger"},"message":"Attempt at fixing using placeholders for upload paths, for upload\nelements in repeat group using placeholders for elements in that repeat\ngroup.  Need to grab the $repeatCount instance, and do the replacement\nby hand, as parseMessageForPlaceholders() will use a comma seperated\nlist of all repeat values.","distinct":true,"url":"https://api.github.com/repos/Fabrik/fabrik/commits/20bab1d5a45174eefe1558d1987398533903243e"},{"sha":"be273c411bd8689336695dcf948e93191172176e","author":{"email":"1c3558b3b85b0c902d12ed5b6fda362e0935e58c@gmail.com","name":"Hugh Messenger"},"message":"Hopefully fixed repeat group placeholder issues with file path in upload\nelement.","distinct":true,"url":"https://api.github.com/repos/Fabrik/fabrik/commits/be273c411bd8689336695dcf948e93191172176e"}]}