Starting 'contributing' section page edits
Deleting screenshot from images folder
Using git edits
General page tidy 1
General dev docs tidy part 2
General edits/tidying 3
General dev docs page edits
Final dev doc page tidying/edits
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 224 (Training material)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 238 (Update Ice on Windows paragraph)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 239 (Developer Docs tidy)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 238 bpindelski 'Update Ice on Windows paragraph'
  # PR 239 hflynn 'Developer Docs tidy'

Generated by OMERO-merge-stable#152 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/152/)