GitHub PushEvent at 2014-06-30 08:56:58
Repository: zotonic
Actor: mworrell
Payload: {"shas":[["58d087a3d922e1b61c4ecb8e2ea947ed5e72aae9","d33c80bc45d65303e33ca83108a9952b745af9ef@worrell.nl","core: add 'protocol' to the list of controller parameters that are excluded from url-generation by controller_file_id and controller_redirect.\n\n(cherry picked from commit 47c762eacae17ad8ad7d689530e585419244b8bb)\n\nConflicts:\n\tmodules/mod_base/controllers/controller_file_id.erl","Marc Worrell",true],["a68bdde297b7d369f49497a2a867acbb8e839677","d33c80bc45d65303e33ca83108a9952b745af9ef@worrell.nl","core: if depiction lookup fails due to a timeout, just return 'undefined' instead of crashing.\n\n(cherry picked from commit d7ff3b01f6e6448d75ae495478899e61adc01ce0)","Marc Worrell",true]],"size":2,"ref":"refs/heads/master","head":"a68bdde297b7d369f49497a2a867acbb8e839677"}