{"shas":[["164266b4dc2b393a4c90bda7ac9271be37ded61a","1e8faedd4213a30732eccc54a9f44db1233ae8dc@moorfields.nhs.uk","Merge branch 'development' of github.com:openeyes/OpenEyes into development\n\nConflicts:\n\tprotected/views/patient/_summary.php","paul.anderson"],["83adae1bbec27ca57c9bcf4e047a3a98a821e48d","1e8faedd4213a30732eccc54a9f44db1233ae8dc@moorfields.nhs.uk","Initial code to hook the diagnosis element into the operation event, and patient search into the site index page.\n\nMerge branch 'development' into feature/letterout\n\nConflicts:\n\tprotected/controllers/ClinicalController.php\n\tprotected/controllers/DiagnosisController.php\n\tprotected/models/BaseActiveRecord.php\n\tprotected/models/Patient.php\n\tprotected/models/elements/ElementOperation.php\n\tprotected/views/clinical/create.php\n\tprotected/views/clinical/episodeSummary.php\n\tprotected/views/elements/ElementOperation/_form/1.php\n\tprotected/views/elements/ElementOperation/_view/1.php\n\tprotected/views/layouts/patientMode/main.php","paul.anderson"]],"ref":"refs/heads/feature/letterout","size":2,"head":"83adae1bbec27ca57c9bcf4e047a3a98a821e48d","push_id":38693459}