adding support for django directives
removing versionchanged directive
removing versionadded directive
Improve warning about ln_rm DropBox option.
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Sno-error: PR 973 (Team workflow doc)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Sno-error: PR 975 (Expose upload_rm option in the documentation)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Sno-error: PR 984 (adding support for django directives)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Sno-error

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 973 hflynn 'Team workflow doc'
  # PR 975 ximenesuk 'Expose upload_rm option in the documentation'
  # PR 984 aleksandra-tarkowska 'adding support for django directives'

Generated by OME-5.1-merge-push#446 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/446/)